branch: elpa/php-mode
commit 239b5577f9076c9089a03c5743c5b7b2c180a036
Author: USAMI Kenta <tad...@zonu.me>
Commit: USAMI Kenta <tad...@zonu.me>
Remove 'link face to http addresses in PHPDoc
---
lisp/php-mode.el | 2 --
tests/7.4/arrow-function.php.faces | 8 ++------
tests/issue-136.php.faces | 4 +---
tests/issue-197.php.faces | 4 +---
tests/issue-201.php.faces | 4 +---
tests/issue-305.php.faces | 4 +---
tests/issue-439.php.faces | 4 +---
tests/issue-443.php.27.faces | 4 +---
tests/issue-443.php.faces | 4 +---
tests/lang/doc-comment/comments.php.24.faces | 4 +---
tests/lang/doc-comment/comments.php.27.faces | 4 +---
tests/lang/doc-comment/comments.php.faces | 4 +---
tests/lang/doc-comment/issue-8.php.faces | 4 +---
tests/lang/doc-comment/return-type.php.faces | 4 +---
14 files changed, 14 insertions(+), 44 deletions(-)
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index b6130ded99..d55b8653dc 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1371,8 +1371,6 @@ for \\[find-tag] (which see)."
(regexp-opt php-phpdoc-type-names 'words)
"\\)")
1 font-lock-type-face prepend nil)
- ("https?://[^\n\t ]+"
- 0 'link prepend nil)
("^\\(?:/\\*\\)?\\(?:\\s \\|\\*\\)*\\(@[[:alpha:]][-[:alpha:]\\]*\\)" ;
"@foo ..." markup.
1 'php-doc-annotation-tag prepend nil)))
diff --git a/tests/7.4/arrow-function.php.faces
b/tests/7.4/arrow-function.php.faces
index acfcbc5d3b..a944ea2c40 100644
--- a/tests/7.4/arrow-function.php.faces
+++ b/tests/7.4/arrow-function.php.faces
@@ -1,13 +1,9 @@
;; -*- mode: emacs-lisp -*-
(("<?php" . php-php-tag)
("\n\n")
- ("/**\n * GitHub-Issue: " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode/issues/506"; link font-lock-doc-face)
- ("\n *\n * " . font-lock-doc-face)
+ ("/**\n * GitHub-Issue: https://github.com/emacs-php/php-mode/issues/506\n
*\n * " . font-lock-doc-face)
("@see" php-doc-annotation-tag font-lock-doc-face)
- (" " . font-lock-doc-face)
- ("https://wiki.php.net/rfc/arrow_functions_v2"; link font-lock-doc-face)
- ("\n */" . font-lock-doc-face)
+ (" https://wiki.php.net/rfc/arrow_functions_v2\n */" . font-lock-doc-face)
("\n\n")
("$" . php-variable-sigil)
("fn1" . php-variable-name)
diff --git a/tests/issue-136.php.faces b/tests/issue-136.php.faces
index 218fd8822b..538cdd9754 100644
--- a/tests/issue-136.php.faces
+++ b/tests/issue-136.php.faces
@@ -11,9 +11,7 @@
("@author" php-doc-annotation-tag font-lock-doc-face)
(" USAMI Kenta <tad...@pixiv.com>\n * " . font-lock-doc-face)
("@link" php-doc-annotation-tag font-lock-doc-face)
- (" " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode"; link font-lock-doc-face)
- ("\n * " . font-lock-doc-face)
+ (" https://github.com/emacs-php/php-mode\n * " . font-lock-doc-face)
("@package" php-doc-annotation-tag font-lock-doc-face)
(" " . font-lock-doc-face)
("Emacs\\PHPMode" php-string font-lock-doc-face)
diff --git a/tests/issue-197.php.faces b/tests/issue-197.php.faces
index cd223c5ba4..94f2abefac 100644
--- a/tests/issue-197.php.faces
+++ b/tests/issue-197.php.faces
@@ -1,9 +1,7 @@
;; -*- mode: emacs-lisp -*-
(("<?php" . php-php-tag)
("\n\n")
- ("/**\n * GitHub Issue: " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode/issues/197"; link font-lock-doc-face)
- ("\n *\n * Test that member highlighting goes before highlighting of
cc-mode\n * types\n */" . font-lock-doc-face)
+ ("/**\n * GitHub Issue: https://github.com/emacs-php/php-mode/issues/197\n
*\n * Test that member highlighting goes before highlighting of cc-mode\n *
types\n */" . font-lock-doc-face)
("\n")
("$" . php-variable-sigil)
("test" . php-variable-name)
diff --git a/tests/issue-201.php.faces b/tests/issue-201.php.faces
index 1e47bd40b1..7cd5f111bc 100644
--- a/tests/issue-201.php.faces
+++ b/tests/issue-201.php.faces
@@ -1,9 +1,7 @@
;; -*- mode: emacs-lisp -*-
(("<?php" . php-php-tag)
("\n\n")
- ("/**\n * GitHub Issue: " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode/issues/201"; link font-lock-doc-face)
- ("\n *\n * Test highighting of " . font-lock-doc-face)
+ ("/**\n * GitHub Issue: https://github.com/emacs-php/php-mode/issues/201\n
*\n * Test highighting of " . font-lock-doc-face)
("$" php-doc-$this-sigil php-doc-variable-sigil font-lock-doc-face)
("this" php-doc-$this php-variable-name font-lock-doc-face)
("\n */" . font-lock-doc-face)
diff --git a/tests/issue-305.php.faces b/tests/issue-305.php.faces
index f8934adc70..dc750a49e7 100644
--- a/tests/issue-305.php.faces
+++ b/tests/issue-305.php.faces
@@ -1,9 +1,7 @@
;; -*- mode: emacs-lisp -*-
(("<?php" . php-php-tag)
("\n\n")
- ("/**\n * GitHub Issue: " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode/issues/305"; link font-lock-doc-face)
- ("\n *\n * Test highighting of " . font-lock-doc-face)
+ ("/**\n * GitHub Issue: https://github.com/emacs-php/php-mode/issues/305\n
*\n * Test highighting of " . font-lock-doc-face)
("$" php-doc-variable-sigil font-lock-doc-face)
("this_foo" php-variable-name font-lock-doc-face)
(", " . font-lock-doc-face)
diff --git a/tests/issue-439.php.faces b/tests/issue-439.php.faces
index ce24c9fbe1..595bcbab7f 100644
--- a/tests/issue-439.php.faces
+++ b/tests/issue-439.php.faces
@@ -1,9 +1,7 @@
;; -*- mode: emacs-lisp -*-
(("<?php" . php-php-tag)
("\n\n")
- ("/**\n * GitHub Issue: " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode/issues/439"; link font-lock-doc-face)
- ("\n */" . font-lock-doc-face)
+ ("/**\n * GitHub Issue: https://github.com/emacs-php/php-mode/issues/439\n
*/" . font-lock-doc-face)
("\n\n")
("$" . php-variable-sigil)
("a" . php-variable-name)
diff --git a/tests/issue-443.php.27.faces b/tests/issue-443.php.27.faces
index a14ca61149..f6842d29d9 100644
--- a/tests/issue-443.php.27.faces
+++ b/tests/issue-443.php.27.faces
@@ -8,9 +8,7 @@
("1); ")
("?>" . php-php-tag)
("\n")
- ("/** GitHub Issue: " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode/issues/443"; link font-lock-doc-face)
- (" */" . font-lock-doc-face)
+ ("/** GitHub Issue: https://github.com/emacs-php/php-mode/issues/443 */" .
font-lock-doc-face)
("\n")
("<?xml" . php-php-tag)
(" version")
diff --git a/tests/issue-443.php.faces b/tests/issue-443.php.faces
index 739370ab1b..db34134c11 100644
--- a/tests/issue-443.php.faces
+++ b/tests/issue-443.php.faces
@@ -8,9 +8,7 @@
("1); ")
("?>" . php-php-tag)
("\n")
- ("/** GitHub Issue: " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode/issues/443"; link font-lock-doc-face)
- (" */" . font-lock-doc-face)
+ ("/** GitHub Issue: https://github.com/emacs-php/php-mode/issues/443 */" .
font-lock-doc-face)
("\n")
("<?xml" . php-php-tag)
(" version")
diff --git a/tests/lang/doc-comment/comments.php.24.faces
b/tests/lang/doc-comment/comments.php.24.faces
index a411a2ff87..593bb49e37 100644
--- a/tests/lang/doc-comment/comments.php.24.faces
+++ b/tests/lang/doc-comment/comments.php.24.faces
@@ -11,9 +11,7 @@
("@author" php-doc-annotation-tag font-lock-doc-face)
(" USAMI Kenta <tad...@pixiv.com>\n * " . font-lock-doc-face)
("@link" php-doc-annotation-tag font-lock-doc-face)
- (" " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode"; link font-lock-doc-face)
- ("\n * " . font-lock-doc-face)
+ (" https://github.com/emacs-php/php-mode\n * " . font-lock-doc-face)
("@package" php-doc-annotation-tag font-lock-doc-face)
(" " . font-lock-doc-face)
("Emacs\\PHPMode" php-string font-lock-doc-face)
diff --git a/tests/lang/doc-comment/comments.php.27.faces
b/tests/lang/doc-comment/comments.php.27.faces
index e48028c88a..b659a0ab42 100644
--- a/tests/lang/doc-comment/comments.php.27.faces
+++ b/tests/lang/doc-comment/comments.php.27.faces
@@ -11,9 +11,7 @@
("@author" php-doc-annotation-tag font-lock-doc-face)
(" USAMI Kenta <tad...@pixiv.com>\n * " . font-lock-doc-face)
("@link" php-doc-annotation-tag font-lock-doc-face)
- (" " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode"; link font-lock-doc-face)
- ("\n * " . font-lock-doc-face)
+ (" https://github.com/emacs-php/php-mode\n * " . font-lock-doc-face)
("@package" php-doc-annotation-tag font-lock-doc-face)
(" " . font-lock-doc-face)
("Emacs\\PHPMode" php-string font-lock-doc-face)
diff --git a/tests/lang/doc-comment/comments.php.faces
b/tests/lang/doc-comment/comments.php.faces
index e6748c07b7..c849191177 100644
--- a/tests/lang/doc-comment/comments.php.faces
+++ b/tests/lang/doc-comment/comments.php.faces
@@ -11,9 +11,7 @@
("@author" php-doc-annotation-tag font-lock-doc-face)
(" USAMI Kenta <tad...@pixiv.com>\n * " . font-lock-doc-face)
("@link" php-doc-annotation-tag font-lock-doc-face)
- (" " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode"; link font-lock-doc-face)
- ("\n * " . font-lock-doc-face)
+ (" https://github.com/emacs-php/php-mode\n * " . font-lock-doc-face)
("@package" php-doc-annotation-tag font-lock-doc-face)
(" " . font-lock-doc-face)
("Emacs\\PHPMode" php-string font-lock-doc-face)
diff --git a/tests/lang/doc-comment/issue-8.php.faces
b/tests/lang/doc-comment/issue-8.php.faces
index 82ce472382..5a107591c8 100644
--- a/tests/lang/doc-comment/issue-8.php.faces
+++ b/tests/lang/doc-comment/issue-8.php.faces
@@ -1,9 +1,7 @@
;; -*- mode: emacs-lisp -*-
(("<?php" . php-php-tag)
("\n\n")
- ("/**\n * Github Issue: " . font-lock-doc-face)
- ("https://github.com/emacs-php/php-mode/issues/8"; link font-lock-doc-face)
- ("\n *\n * The code below contains annotations in the comments which begin\n
* with the '@' character. The highlighting for these annotations\n * should be
different from that used for comments. At the very least\n * php-mode should
highlight the part up to the first backslash.\n */" . font-lock-doc-face)
+ ("/**\n * Github Issue: https://github.com/emacs-php/php-mode/issues/8\n
*\n * The code below contains annotations in the comments which begin\n * with
the '@' character. The highlighting for these annotations\n * should be
different from that used for comments. At the very least\n * php-mode should
highlight the part up to the first backslash.\n */" . font-lock-doc-face)
("\n\n")
("/**\n * " . font-lock-doc-face)
("@ORM\\Entity" php-doc-annotation-tag font-lock-doc-face)
diff --git a/tests/lang/doc-comment/return-type.php.faces
b/tests/lang/doc-comment/return-type.php.faces
index 7bc8a8ec17..9aa5a57eb4 100644
--- a/tests/lang/doc-comment/return-type.php.faces
+++ b/tests/lang/doc-comment/return-type.php.faces
@@ -3,9 +3,7 @@
("\n\n")
("/**\n * Test for type annotation in doc comment\n *\n * The specification
is defined in PSR-5 (draft) Appendix A. Types.\n * This implementation contains
unstandardized specification.\n *\n * " . font-lock-doc-face)
("@see" php-doc-annotation-tag font-lock-doc-face)
- (" " . font-lock-doc-face)
-
("https://github.com/php-fig/fig-standards/blob/master/proposed/phpdoc.md#appendix-a-types";
link font-lock-doc-face)
- ("\n */" . font-lock-doc-face)
+ ("
https://github.com/php-fig/fig-standards/blob/master/proposed/phpdoc.md#appendix-a-types\n
*/" . font-lock-doc-face)
("\n\n")
("// " . font-lock-comment-delimiter-face)
("Test for premitive type (int)\n" . font-lock-comment-face)
