procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve font-locking and indentation in 'php-ts-mode'

Browse source 
* lisp/progmodes/php-ts-mode.el (php-ts-mode--language-source-alist):
Updated to latest version of PHP grammar.
(php-ts-mode--indent-styles): 'namespace_use_declaration' is now
correctly indented.
(php-ts-mode--operators): Support of the "argument unpacking
operator".
(php-ts-mode--font-lock-settings): 'nullsafe_member_call_expression'
is now highlighted correctly.
(php-ts-mode--comment-indent-new-line): Delete trailing whitespace
before inserting newline (see bug#73900 for more information).
Bug#74239
This commit is contained in:
Vincenzo Pupillo 2024-11-07 12:55:50 +01:00 • committed by Eli Zaretskii
parent 27aacbd172
commit f69f54c454
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,7 @@
;;; 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.23.4" "php/src")) '((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.23.5" "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.23.0")) (html . ("https://github.com/tree-sitter/tree-sitter-html" "v0.23.0"))
(javascript . ("https://github.com/tree-sitter/tree-sitter-javascript" "v0.23.0")) (javascript . ("https://github.com/tree-sitter/tree-sitter-javascript" "v0.23.0"))
@ -640,6 +640,7 @@ characters of the current line."
((query "(class_interface_clause (qualified_name) @indent)") ((query "(class_interface_clause (qualified_name) @indent)")
parent-bol php-ts-mode-indent-offset) parent-bol php-ts-mode-indent-offset)
((parent-is "class_declaration") parent-bol 0) ((parent-is "class_declaration") parent-bol 0)
((parent-is "namespace_use_declaration") parent-bol php-ts-mode-indent-offset)
((parent-is "namespace_use_group") parent-bol php-ts-mode-indent-offset) ((parent-is "namespace_use_group") parent-bol php-ts-mode-indent-offset)
((parent-is "function_definition") parent-bol 0) ((parent-is "function_definition") parent-bol 0)
((parent-is "member_call_expression") first-sibling php-ts-mode-indent-offset) ((parent-is "member_call_expression") first-sibling php-ts-mode-indent-offset)
@ -781,7 +782,7 @@ characters of the current line."
'("--" "**=" "*=" "/=" "%=" "+=" "-=" ".=" "<<=" ">>=" "&=" "^=" '("--" "**=" "*=" "/=" "%=" "+=" "-=" ".=" "<<=" ">>=" "&=" "^="
"|=" "??" "??=" "||" "&&" "|" "^" "&" "==" "!=" "<>" "===" "!==" "|=" "??" "??=" "||" "&&" "|" "^" "&" "==" "!=" "<>" "===" "!=="
"<" ">" "<=" ">=" "<=>" "<<" ">>" "+" "-" "." "*" "**" "/" "%" "<" ">" "<=" ">=" "<=>" "<<" ">>" "+" "-" "." "*" "**" "/" "%"
"->" "?->") "->" "?->" "...")
"PHP operators for tree-sitter font-locking.") "PHP operators for tree-sitter font-locking.")
(defconst php-ts-mode--predefined-constant (defconst php-ts-mode--predefined-constant
@ -993,7 +994,7 @@ characters of the current line."
(member_call_expression (member_call_expression
name: (_) @font-lock-function-call-face) name: (_) @font-lock-function-call-face)
(nullsafe_member_call_expression (nullsafe_member_call_expression
name: (_) @font-lock-constant-face)) name: (_) @font-lock-function-call-face))
:language 'php :language 'php
:feature 'argument :feature 'argument
@ -1266,8 +1267,14 @@ less common PHP-style # comment. SOFT works the same as in
(line-end-position) (line-end-position)
t nil)) t nil))
(let ((offset (- (match-beginning 0) (line-beginning-position))) (let ((offset (- (match-beginning 0) (line-beginning-position)))
(comment-prefix (match-string 0))) (comment-prefix (match-string 0))
(if soft (insert-and-inherit ?\n) (newline 1)) (insert-line-break
(lambda ()
(delete-horizontal-space)
(if soft
(insert-and-inherit ?\n)
(newline 1)))))
(funcall insert-line-break)
(delete-region (line-beginning-position) (point)) (delete-region (line-beginning-position) (point))
(insert (insert
(make-string offset ?\s) (make-string offset ?\s)