* bug#72796: 30.0.50; [PATCH] php-ts-mode: Improved font locking
@ 2024-08-24 21:41 Vincenzo Pupillo
2024-08-26 7:52 ` Yuan Fu
0 siblings, 1 reply; 4+ messages in thread
From: Vincenzo Pupillo @ 2024-08-24 21:41 UTC (permalink / raw)
To: 72796
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
Hi,
This patch improves font locking, particularly for constants and some
operators. It also extends compatibility to the latest version of the PHP
parser.
The patch can also be applied to version 31.0.50 .
Thanks
Vincenzo
[-- Attachment #2: 0001-Improve-php-ts-mode-font-lock-and-support-latest-par.patch --]
[-- Type: text/x-patch, Size: 6855 bytes --]
From 59fd3b34171f5ff17509e8c6c4e73f457ca4d038 Mon Sep 17 00:00:00 2001
From: Vincenzo Pupillo <v.pupillo@gmail.com>
Date: Sat, 24 Aug 2024 23:16:09 +0200
Subject: [PATCH] Improve php-ts-mode font lock and support latest parser
release
* lisp/progmodes/php-ts-mode.el (php-ts-mode--language-source-alist):
Update the parser version.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--parent-html-heuristic):
Fix commentary.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--keywords): Add "exit"
keyword.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--predefined-constant):
Added math constant.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--font-lock-settings):
New and improved rules.
---
lisp/progmodes/php-ts-mode.el | 41 ++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index 89444f0208e..3f89de14075 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -83,7 +83,7 @@
;;; Install treesitter language parsers
(defvar php-ts-mode--language-source-alist
- '((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.22.5"))
+ '((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.22.8" "php/src"))
(phpdoc . ("https://github.com/claytonrcarter/tree-sitter-phpdoc"))
(html . ("https://github.com/tree-sitter/tree-sitter-html" "v0.20.3"))
(javascript . ("https://github.com/tree-sitter/tree-sitter-javascript" "v0.21.2"))
@@ -509,7 +509,7 @@ php-ts-mode--parent-html-heuristic
(if (search-forward "</html>" end-html t 1)
0
(+ (point) php-ts-mode-indent-offset))))
- ;; Maybe it's better to use bol, read the documentation!!!
+ ;; Maybe it's better to use bol?
(treesit-node-start parent))))
(defun php-ts-mode--array-element-heuristic (_node parent _bol &rest _)
@@ -728,7 +728,7 @@ php-ts-mode--keywords
'("abstract" "and" "array" "as" "break" "callable" "case" "catch"
"class" "clone" "const" "continue" "declare" "default" "do" "echo"
"else" "elseif" "enddeclare" "endfor" "endforeach" "endif"
- "endswitch" "endwhile" "enum" "extends" "final" "finally" "fn"
+ "endswitch" "endwhile" "enum" "exit" "extends" "final" "finally" "fn"
"for" "foreach" "from" "function" "global" "goto" "if" "implements"
"include" "include_once" "instanceof" "insteadof" "interface"
"list" "match" "namespace" "new" "null" "or" "print" "private"
@@ -762,6 +762,12 @@ php-ts-mode--predefined-constant
"E_COMPILE_WARNING" "E_USER_ERROR" "E_USER_WARNING"
"E_USER_NOTICE" "E_DEPRECATED" "E_USER_DEPRECATED"
"E_ALL" "E_STRICT"
+ ;; math constant
+ "M_PI" "M_E" "M_LOG2E" "M_LOG10E" "M_LN2" "M_LN10" "M_PI_2"
+ "M_PI_4" "M_1_PI" "M_2_PI" "M_SQRTPI" "M_2_SQRTPI" "M_SQRT2"
+ "M_SQRT3" "M_SQRT1_2" "M_LNPI" "M_EULER" "PHP_ROUND_HALF_UP"
+ "PHP_ROUND_HALF_DOWN" "PHP_ROUND_HALF_EVEN" "PHP_ROUND_HALF_ODD"
+ "NAN" "INF"
;; magic constant
"__COMPILER_HALT_OFFSET__" "__CLASS__" "__DIR__" "__FILE__"
"__FUNCTION__" "__LINE__" "__METHOD__" "__NAMESPACE__" "__TRAIT__")
@@ -785,26 +791,23 @@ php-ts-mode--font-lock-settings
:feature 'constant
`((boolean) @font-lock-constant-face
(null) @font-lock-constant-face
- ;; predefined constant or built in constant
+ ;; predefined constant or built in constant (part of PHP core)
((name) @font-lock-builtin-face
(:match ,(rx-to-string
`(: bos (or ,@php-ts-mode--predefined-constant) eos))
@font-lock-builtin-face))
;; user defined constant
((name) @font-lock-constant-face
- (:match "\\`_?[A-Z][0-9A-Z_]+\\'" @font-lock-constant-face))
+ (:match "\\`_*[A-Z][0-9A-Z_]+\\'" @font-lock-constant-face))
(const_declaration
(const_element (name) @font-lock-constant-face))
- (relative_scope "self") @font-lock-builtin-face
;; declare directive
(declare_directive ["strict_types" "encoding" "ticks"] @font-lock-constant-face))
:language 'php
:feature 'name
- `((goto_statement (name) @font-lock-constant-face)
- (named_label_statement (name) @font-lock-constant-face)
- (expression_statement (name) @font-lock-keyword-face
- (:equal "exit" @font-lock-keyword-face)))
+ '((goto_statement (name) @font-lock-constant-face)
+ (named_label_statement (name) @font-lock-constant-face))
:language 'php
;;:override t
@@ -813,19 +816,21 @@ php-ts-mode--font-lock-settings
:language 'php
:feature 'operator
- `([,@php-ts-mode--operators] @font-lock-operator-face)
+ `((error_suppression_expression "@" @font-lock-keyword-face)
+ [,@php-ts-mode--operators] @font-lock-operator-face)
:language 'php
:feature 'variable-name
:override t
- `(((name) @font-lock-keyword-face (:equal "this" @font-lock-keyword-face))
+ '(((name) @font-lock-keyword-face (:equal "this" @font-lock-keyword-face))
(variable_name (name) @font-lock-variable-name-face)
+ (relative_scope ["parent" "self" "static"] @font-lock-builtin-face)
+ (relative_scope) @font-lock-constant-face
(dynamic_variable_name (name) @font-lock-variable-name-face)
(member_access_expression
name: (_) @font-lock-variable-name-face)
(scoped_property_access_expression
- scope: (name) @font-lock-constant-face)
- (error_suppression_expression (name) @font-lock-variable-name-face))
+ scope: (name) @font-lock-constant-face))
:language 'php
:feature 'string
@@ -850,7 +855,8 @@ php-ts-mode--font-lock-settings
:language 'php
:feature 'type
:override t
- '((union_type) @font-lock-type-face
+ '((union_type "|" @font-lock-operator-face)
+ (union_type) @font-lock-type-face
(bottom_type) @font-lock-type-face
(primitive_type) @font-lock-type-face
(cast_type) @font-lock-type-face
@@ -883,17 +889,18 @@ php-ts-mode--font-lock-settings
("=>") @font-lock-keyword-face
(object_creation_expression
(name) @font-lock-type-face)
+ (namespace_name_as_prefix "\\" @font-lock-delimiter-face)
(namespace_name_as_prefix (namespace_name (name)) @font-lock-type-face)
(namespace_use_clause (name) @font-lock-property-use-face)
(namespace_aliasing_clause (name) @font-lock-type-face)
+ (namespace_name "\\" @font-lock-delimiter-face)
(namespace_name (name) @font-lock-type-face)
(use_declaration (name) @font-lock-property-use-face))
:language 'php
:feature 'function-scope
:override t
- '((relative_scope) @font-lock-constant-face
- (scoped_call_expression
+ '((scoped_call_expression
scope: (name) @font-lock-constant-face)
(class_constant_access_expression (name) @font-lock-constant-face))
--
2.46.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#72796: 30.0.50; [PATCH] php-ts-mode: Improved font locking
2024-08-24 21:41 bug#72796: 30.0.50; [PATCH] php-ts-mode: Improved font locking Vincenzo Pupillo
@ 2024-08-26 7:52 ` Yuan Fu
2024-08-26 10:16 ` Vincenzo Pupillo
0 siblings, 1 reply; 4+ messages in thread
From: Yuan Fu @ 2024-08-26 7:52 UTC (permalink / raw)
To: Vincenzo Pupillo; +Cc: 72796-done
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
> On Aug 24, 2024, at 2:41 PM, Vincenzo Pupillo <v.pupillo@gmail.com> wrote:
>
> Hi,
> This patch improves font locking, particularly for constants and some
> operators. It also extends compatibility to the latest version of the PHP
> parser.
> The patch can also be applied to version 31.0.50 .
>
> Thanks
> Vincenzo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Improve-php-ts-mode-font-lock-and-support-latest-par.patch --]
[-- Type: text/x-patch; x-unix-mode=0644; name="0001-Improve-php-ts-mode-font-lock-and-support-latest-par.patch", Size: 7010 bytes --]
From 59fd3b34171f5ff17509e8c6c4e73f457ca4d038 Mon Sep 17 00:00:00 2001
From: Vincenzo Pupillo <v.pupillo@gmail.com>
Date: Sat, 24 Aug 2024 23:16:09 +0200
Subject: [PATCH] Improve php-ts-mode font lock and support latest parser
release
* lisp/progmodes/php-ts-mode.el (php-ts-mode--language-source-alist):
Update the parser version.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--parent-html-heuristic):
Fix commentary.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--keywords): Add "exit"
keyword.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--predefined-constant):
Added math constant.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--font-lock-settings):
New and improved rules.
---
lisp/progmodes/php-ts-mode.el | 41 ++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index 89444f0208e..3f89de14075 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -83,7 +83,7 @@
;;; Install treesitter language parsers
(defvar php-ts-mode--language-source-alist
- '((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.22.5"))
+ '((php . ("https://github.com/tree-sitter/tree-sitter-php" "v0.22.8" "php/src"))
(phpdoc . ("https://github.com/claytonrcarter/tree-sitter-phpdoc"))
(html . ("https://github.com/tree-sitter/tree-sitter-html" "v0.20.3"))
(javascript . ("https://github.com/tree-sitter/tree-sitter-javascript" "v0.21.2"))
@@ -509,7 +509,7 @@ php-ts-mode--parent-html-heuristic
(if (search-forward "</html>" end-html t 1)
0
(+ (point) php-ts-mode-indent-offset))))
- ;; Maybe it's better to use bol, read the documentation!!!
+ ;; Maybe it's better to use bol?
(treesit-node-start parent))))
(defun php-ts-mode--array-element-heuristic (_node parent _bol &rest _)
@@ -728,7 +728,7 @@ php-ts-mode--keywords
'("abstract" "and" "array" "as" "break" "callable" "case" "catch"
"class" "clone" "const" "continue" "declare" "default" "do" "echo"
"else" "elseif" "enddeclare" "endfor" "endforeach" "endif"
- "endswitch" "endwhile" "enum" "extends" "final" "finally" "fn"
+ "endswitch" "endwhile" "enum" "exit" "extends" "final" "finally" "fn"
"for" "foreach" "from" "function" "global" "goto" "if" "implements"
"include" "include_once" "instanceof" "insteadof" "interface"
"list" "match" "namespace" "new" "null" "or" "print" "private"
@@ -762,6 +762,12 @@ php-ts-mode--predefined-constant
"E_COMPILE_WARNING" "E_USER_ERROR" "E_USER_WARNING"
"E_USER_NOTICE" "E_DEPRECATED" "E_USER_DEPRECATED"
"E_ALL" "E_STRICT"
+ ;; math constant
+ "M_PI" "M_E" "M_LOG2E" "M_LOG10E" "M_LN2" "M_LN10" "M_PI_2"
+ "M_PI_4" "M_1_PI" "M_2_PI" "M_SQRTPI" "M_2_SQRTPI" "M_SQRT2"
+ "M_SQRT3" "M_SQRT1_2" "M_LNPI" "M_EULER" "PHP_ROUND_HALF_UP"
+ "PHP_ROUND_HALF_DOWN" "PHP_ROUND_HALF_EVEN" "PHP_ROUND_HALF_ODD"
+ "NAN" "INF"
;; magic constant
"__COMPILER_HALT_OFFSET__" "__CLASS__" "__DIR__" "__FILE__"
"__FUNCTION__" "__LINE__" "__METHOD__" "__NAMESPACE__" "__TRAIT__")
@@ -785,26 +791,23 @@ php-ts-mode--font-lock-settings
:feature 'constant
`((boolean) @font-lock-constant-face
(null) @font-lock-constant-face
- ;; predefined constant or built in constant
+ ;; predefined constant or built in constant (part of PHP core)
((name) @font-lock-builtin-face
(:match ,(rx-to-string
`(: bos (or ,@php-ts-mode--predefined-constant) eos))
@font-lock-builtin-face))
;; user defined constant
((name) @font-lock-constant-face
- (:match "\\`_?[A-Z][0-9A-Z_]+\\'" @font-lock-constant-face))
+ (:match "\\`_*[A-Z][0-9A-Z_]+\\'" @font-lock-constant-face))
(const_declaration
(const_element (name) @font-lock-constant-face))
- (relative_scope "self") @font-lock-builtin-face
;; declare directive
(declare_directive ["strict_types" "encoding" "ticks"] @font-lock-constant-face))
:language 'php
:feature 'name
- `((goto_statement (name) @font-lock-constant-face)
- (named_label_statement (name) @font-lock-constant-face)
- (expression_statement (name) @font-lock-keyword-face
- (:equal "exit" @font-lock-keyword-face)))
+ '((goto_statement (name) @font-lock-constant-face)
+ (named_label_statement (name) @font-lock-constant-face))
:language 'php
;;:override t
@@ -813,19 +816,21 @@ php-ts-mode--font-lock-settings
:language 'php
:feature 'operator
- `([,@php-ts-mode--operators] @font-lock-operator-face)
+ `((error_suppression_expression "@" @font-lock-keyword-face)
+ [,@php-ts-mode--operators] @font-lock-operator-face)
:language 'php
:feature 'variable-name
:override t
- `(((name) @font-lock-keyword-face (:equal "this" @font-lock-keyword-face))
+ '(((name) @font-lock-keyword-face (:equal "this" @font-lock-keyword-face))
(variable_name (name) @font-lock-variable-name-face)
+ (relative_scope ["parent" "self" "static"] @font-lock-builtin-face)
+ (relative_scope) @font-lock-constant-face
(dynamic_variable_name (name) @font-lock-variable-name-face)
(member_access_expression
name: (_) @font-lock-variable-name-face)
(scoped_property_access_expression
- scope: (name) @font-lock-constant-face)
- (error_suppression_expression (name) @font-lock-variable-name-face))
+ scope: (name) @font-lock-constant-face))
:language 'php
:feature 'string
@@ -850,7 +855,8 @@ php-ts-mode--font-lock-settings
:language 'php
:feature 'type
:override t
- '((union_type) @font-lock-type-face
+ '((union_type "|" @font-lock-operator-face)
+ (union_type) @font-lock-type-face
(bottom_type) @font-lock-type-face
(primitive_type) @font-lock-type-face
(cast_type) @font-lock-type-face
@@ -883,17 +889,18 @@ php-ts-mode--font-lock-settings
("=>") @font-lock-keyword-face
(object_creation_expression
(name) @font-lock-type-face)
+ (namespace_name_as_prefix "\\" @font-lock-delimiter-face)
(namespace_name_as_prefix (namespace_name (name)) @font-lock-type-face)
(namespace_use_clause (name) @font-lock-property-use-face)
(namespace_aliasing_clause (name) @font-lock-type-face)
+ (namespace_name "\\" @font-lock-delimiter-face)
(namespace_name (name) @font-lock-type-face)
(use_declaration (name) @font-lock-property-use-face))
:language 'php
:feature 'function-scope
:override t
- '((relative_scope) @font-lock-constant-face
- (scoped_call_expression
+ '((scoped_call_expression
scope: (name) @font-lock-constant-face)
(class_constant_access_expression (name) @font-lock-constant-face))
--
2.46.0
[-- Attachment #3: Type: text/plain, Size: 396 bytes --]
Thanks Vince! I merged your patch to emacs-30. BTW, in the future it’s probably better to make the code work for both old and new grammar versions (whenever you can), that way people who installed the old grammar from who-knows-where can still use the mode. (I’m working on some tool to make it simpler to define alternative font-lock rules that works on multiple grammar versions.)
Yuan
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#72796: 30.0.50; [PATCH] php-ts-mode: Improved font locking
2024-08-26 7:52 ` Yuan Fu
@ 2024-08-26 10:16 ` Vincenzo Pupillo
2024-08-26 11:32 ` Eli Zaretskii
0 siblings, 1 reply; 4+ messages in thread
From: Vincenzo Pupillo @ 2024-08-26 10:16 UTC (permalink / raw)
To: Yuan Fu; +Cc: 72796-done
[-- Attachment #1: Type: text/plain, Size: 1281 bytes --]
Thanks Yuan.
I also tested the patch with the previous version of Grammar (v0.22.5) and
found no problems. Did you experience any problems?
Since php-ts-mode is not available in emacs-29 and emacs-30 has not been
released, perhaps it is better to support grammars from the release date.
Or is it better to support from the date of the first merge? I have no
idea which is the best policy.
Thanks.
Vincenzo
Il giorno lun 26 ago 2024 alle ore 09:52 Yuan Fu <casouri@gmail.com> ha
scritto:
>
>
> > On Aug 24, 2024, at 2:41 PM, Vincenzo Pupillo <v.pupillo@gmail.com>
> wrote:
> >
> > Hi,
> > This patch improves font locking, particularly for constants and some
> > operators. It also extends compatibility to the latest version of the
> PHP
> > parser.
> > The patch can also be applied to version 31.0.50 .
> >
> > Thanks
> > Vincenzo
> Thanks Vince! I merged your patch to emacs-30. BTW, in the future it’s
> probably better to make the code work for both old and new grammar versions
> (whenever you can), that way people who installed the old grammar from
> who-knows-where can still use the mode. (I’m working on some tool to make
> it simpler to define alternative font-lock rules that works on multiple
> grammar versions.)
>
> Yuan
[-- Attachment #2: Type: text/html, Size: 1705 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#72796: 30.0.50; [PATCH] php-ts-mode: Improved font locking
2024-08-26 10:16 ` Vincenzo Pupillo
@ 2024-08-26 11:32 ` Eli Zaretskii
0 siblings, 0 replies; 4+ messages in thread
From: Eli Zaretskii @ 2024-08-26 11:32 UTC (permalink / raw)
To: Vincenzo Pupillo; +Cc: casouri, 72796
> Cc: 72796-done@debbugs.gnu.org
> From: Vincenzo Pupillo <v.pupillo@gmail.com>
> Date: Mon, 26 Aug 2024 12:16:23 +0200
>
> Since php-ts-mode is not available in emacs-29 and emacs-30 has not been released, perhaps it is better to
> support grammars from the release date. Or is it better to support from the date of the first merge? I have no
> idea which is the best policy.
We cannot be sure that users of this mode will necessarily have the
latest grammar library. It depends on various factors, like the
installation policies on the user's system. So I think it's best to
be tolerant to the version of the grammar, if this is feasible.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-26 11:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-24 21:41 bug#72796: 30.0.50; [PATCH] php-ts-mode: Improved font locking Vincenzo Pupillo
2024-08-26 7:52 ` Yuan Fu
2024-08-26 10:16 ` Vincenzo Pupillo
2024-08-26 11:32 ` Eli Zaretskii
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.