diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6432169b..812bb683 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: steps: - uses: actions/setup-python@v2 with: - python-version: '3.6' + python-version: '3.11' architecture: 'x64' - uses: purcell/setup-emacs@master with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 46645760..c2856de8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,14 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. - +## Unreleased + +### Removed + + * No longer highlights `'link` in PHPDoc ([#724]) + * Please use `goto-address-prog-mode` minor mode + +[#724]: https://github.com/emacs-php/php-mode/pull/724 ## [1.24.2] - 2022-11-13 diff --git a/lisp/php-mode.el b/lisp/php-mode.el index b6130ded..d55b8653 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 acfcbc5d..a944ea2c 100644 --- a/tests/7.4/arrow-function.php.faces +++ b/tests/7.4/arrow-function.php.faces @@ -1,13 +1,9 @@ ;; -*- mode: emacs-lisp -*- (("\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 cd223c5b..94f2abef 100644 --- a/tests/issue-197.php.faces +++ b/tests/issue-197.php.faces @@ -1,9 +1,7 @@ ;; -*- mode: emacs-lisp -*- (("" . 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") ("" . 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") ("\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 e48028c8..b659a0ab 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 \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 e6748c07..c8491911 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 \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 82ce4723..5a107591 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 -*- (("