mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-08 15:30:40 -08:00
Code Issues Projects Releases Wiki Activity

Fix php-ts-mode font-lock for latest PHP grammar (bug#73516)

Browse source 
Version 0.23 of the PHP grammar introduced some changes that
affect the font lock.

* lisp/progmodes/php-ts-mode.el
(php-ts-mode--language-source-alist): Update php, html, js and css
grammars version.
(php-ts-mode--parent-html-heuristic): Fix docstring
(php-ts-mode--test-namespace-name-as-prefix-p): New function.
(php-ts-mode--test-namespace-aliasing-clause-p): New function.
(php-ts-mode--test-namespace-use-group-clause-p): New function.
(php-ts-mode--font-lock-settings): Use the new functions.
This commit is contained in:
Vincenzo Pupillo 2024-09-27 13:07:06 +02:00 • committed by Yuan Fu
parent 68f53e4348
commit 69d8f9d1b7
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

47
lisp/progmodes/php-ts-mode.el
View file

@ -83,12 +83,12 @@
;;; Install treesitter language parsers ;;; Install treesitter language parsers
(defvar php-ts-mode--language-source-alist (defvar php-ts-mode--language-source-alist
'((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.22.8" "php/src")) '((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.23.0" "php/src"))
(phpdoc . ("https://github.com/claytonrcarter/tree-sitter-phpdoc")) (phpdoc . ("https://github.com/claytonrcarter/tree-sitter-phpdoc"))
(html . ("https://github.com/tree-sitter/tree-sitter-html" "v0.20.3")) (html . ("https://github.com/tree-sitter/tree-sitter-html" "v0.23.0"))
(javascript . ("https://github.com/tree-sitter/tree-sitter-javascript" "v0.21.2")) (javascript . ("https://github.com/tree-sitter/tree-sitter-javascript" "v0.23.0"))
(jsdoc . ("https://github.com/tree-sitter/tree-sitter-jsdoc" "v0.21.0")) (jsdoc . ("https://github.com/tree-sitter/tree-sitter-jsdoc" "v0.23.0"))
(css . ("https://github.com/tree-sitter/tree-sitter-css" "v0.21.0"))) (css . ("https://github.com/tree-sitter/tree-sitter-css" "v0.23.0")))
"Treesitter language parsers required by `php-ts-mode'. "Treesitter language parsers required by `php-ts-mode'.
You can customize this variable if you want to stick to a specific You can customize this variable if you want to stick to a specific
commit and/or use different parsers.") commit and/or use different parsers.")
@ -490,7 +490,7 @@ characters of the current line."
(treesit-node-start parent))))) (treesit-node-start parent)))))
(defun php-ts-mode--parent-html-heuristic (node parent _bol &rest _) (defun php-ts-mode--parent-html-heuristic (node parent _bol &rest _)
"Returns position based on html indentation. "Return position based on html indentation.
Returns 0 if the NODE is after the </html>, otherwise returns the Returns 0 if the NODE is after the </html>, otherwise returns the
indentation point of the last word before the NODE, plus the indentation point of the last word before the NODE, plus the
@ -773,6 +773,21 @@ characters of the current line."
"__FUNCTION__" "__LINE__" "__METHOD__" "__NAMESPACE__" "__TRAIT__") "__FUNCTION__" "__LINE__" "__METHOD__" "__NAMESPACE__" "__TRAIT__")
"PHP predefined constant.") "PHP predefined constant.")
(defun php-ts-mode--test-namespace-name-as-prefix-p ()
"Return t if the namespace_name_as_prefix keyword is a namded node, nil otherwise."
(ignore-errors
(progn (treesit-query-compile 'php "(namespace_name_as_prefix)" t) t)))
(defun php-ts-mode--test-namespace-aliasing-clause-p ()
"Return t if the namespace_name_as_prefix keyword is a namded node, nil otherwise."
(ignore-errors
(progn (treesit-query-compile 'php "(namespace_name_as_prefix)" t) t)))
(defun php-ts-mode--test-namespace-use-group-clause-p ()
"Return t if the namespace_use_group_clause keyword is a namded node, nil otherwise."
(ignore-errors
(progn (treesit-query-compile 'php "(namespace_use_group_clause)" t) t)))
(defun php-ts-mode--font-lock-settings () (defun php-ts-mode--font-lock-settings ()
"Tree-sitter font-lock settings." "Tree-sitter font-lock settings."
(treesit-font-lock-rules (treesit-font-lock-rules
@ -866,7 +881,7 @@ characters of the current line."
:language 'php :language 'php
:feature 'definition :feature 'definition
:override t :override t
'((php_tag) @font-lock-preprocessor-face `((php_tag) @font-lock-preprocessor-face
("?>") @font-lock-preprocessor-face ("?>") @font-lock-preprocessor-face
;; Highlights identifiers in declarations. ;; Highlights identifiers in declarations.
(class_declaration (class_declaration
@ -889,10 +904,16 @@ characters of the current line."
("=>") @font-lock-keyword-face ("=>") @font-lock-keyword-face
(object_creation_expression (object_creation_expression
(name) @font-lock-type-face) (name) @font-lock-type-face)
(namespace_name_as_prefix "\\" @font-lock-delimiter-face) ,@(when (php-ts-mode--test-namespace-name-as-prefix-p)
(namespace_name_as_prefix (namespace_name (name)) @font-lock-type-face) '((namespace_name_as_prefix "\\" @font-lock-delimiter-face)
(namespace_use_clause (name) @font-lock-property-use-face) (namespace_name_as_prefix
(namespace_aliasing_clause (name) @font-lock-type-face) (namespace_name (name)) @font-lock-type-face)))
,@(if (php-ts-mode--test-namespace-aliasing-clause-p)
'((namespace_aliasing_clause (name) @font-lock-type-face))
'((namespace_use_clause alias: (name) @font-lock-type-face)))
,@(when (not (php-ts-mode--test-namespace-use-group-clause-p))
'((namespace_use_group
(namespace_use_clause (name) @font-lock-type-face))))
(namespace_name "\\" @font-lock-delimiter-face) (namespace_name "\\" @font-lock-delimiter-face)
(namespace_name (name) @font-lock-type-face) (namespace_name (name) @font-lock-type-face)
(use_declaration (name) @font-lock-property-use-face)) (use_declaration (name) @font-lock-property-use-face))
@ -931,8 +952,10 @@ characters of the current line."
:language 'php :language 'php
:feature 'base-clause :feature 'base-clause
:override t :override t
'((base_clause (name) @font-lock-type-face) `((base_clause (name) @font-lock-type-face)
(use_as_clause (name) @font-lock-property-use-face) (use_as_clause (name) @font-lock-property-use-face)
,@(when (not (php-ts-mode--test-namespace-name-as-prefix-p))
'((qualified_name prefix: "\\" @font-lock-delimiter-face)))
(qualified_name (name) @font-lock-constant-face)) (qualified_name (name) @font-lock-constant-face))
:language 'php :language 'php