Subject: 30.0.50; Minor treesit cleanups

From: Basil Contovounesios <[email-masked]>
Date: Tue, 13 Jun 2023 19:02:26 +0100

Severity: minor
Tags: patch

I noticed tree-sitter query predicates are using Flength where I believe
list_length can be used directly, and the corresponding error messages
say 'only got N arguments' even when N exceeds the expected number.
Are these changes welcome/okay?

Thanks,

-- 
Basil

>From 8d291e5c704c9d0ebae44d343ab8f3a464589967 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <[email-masked]>
Date: Sat, 3 Jun 2023 11:25:05 +0100
Subject: [PATCH] Minor tree-sitter cleanups

* lisp/treesit.el (treesit-fontify-with-override): Fix docstring
grammar.  Remove redundant precondition.
* src/treesit.c (Ftreesit_parser_set_included_ranges): Fix typo in
commentary.
(treesit_predicate_equal, treesit_predicate_match)
(treesit_predicate_pred): Avoid fixnum roundtrip by using
list_length in place of Flength.  Make error messages more accurate.
(treesit_eval_predicates): Quote predicate names in error message.
---
 lisp/treesit.el |  5 ++---
 src/treesit.c   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index ea701ce1ff7..1dec830687f 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -894,13 +894,12 @@ treesit-fontify-with-override
     (start end face override &optional bound-start bound-end)
   "Apply FACE to the region between START and END.
 OVERRIDE can be nil, t, `append', `prepend', or `keep'.
-See `treesit-font-lock-rules' for their semantic.
+See `treesit-font-lock-rules' for their semantics.
 
 If BOUND-START and BOUND-END are non-nil, only fontify the region
 in between them."
   (when (or (null bound-start) (null bound-end)
-            (and bound-start bound-end
-                 (<= bound-start end)
+            (and (<= bound-start end)
                  (>= bound-end start)))
     (when (and bound-start bound-end)
       (setq start (max bound-start start)
diff --git a/src/treesit.c b/src/treesit.c
index 0af0e347694..ca627e1d7b3 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1649,7 +1649,7 @@ DEFUN ("treesit-parser-set-included-ranges",
       TSRange *treesit_ranges = xmalloc (sizeof (TSRange) * len);
       struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
 
-      /* We can use XFUXNUM, XCAR, XCDR freely because we have checked
+      /* We can use XFIXNUM, XCAR, XCDR freely because we have checked
 	 the input by treesit_check_range_argument.  */
 
       for (int idx = 0; !NILP (ranges); idx++, ranges = XCDR (ranges))
@@ -2500,10 +2500,10 @@ treesit_predicate_capture_name_to_text (Lisp_Object name,
 treesit_predicate_equal (Lisp_Object args, struct capture_range captures,
 			 Lisp_Object *signal_data)
 {
-  if (XFIXNUM (Flength (args)) != 2)
+  if (list_length (args) != 2)
     {
       *signal_data = list2 (build_string ("Predicate `equal' requires "
-					  "two arguments but only given"),
+					  "two arguments but got"),
 			    Flength (args));
       return false;
     }
@@ -2535,10 +2535,10 @@ treesit_predicate_equal (Lisp_Object args, struct capture_range captures,
 treesit_predicate_match (Lisp_Object args, struct capture_range captures,
 			 Lisp_Object *signal_data)
 {
-  if (XFIXNUM (Flength (args)) != 2)
+  if (list_length (args) != 2)
     {
       *signal_data = list2 (build_string ("Predicate `match' requires two "
-					  "arguments but only given"),
+					  "arguments but got"),
 			    Flength (args));
       return false;
     }
@@ -2600,11 +2600,11 @@ treesit_predicate_match (Lisp_Object args, struct capture_range captures,
 treesit_predicate_pred (Lisp_Object args, struct capture_range captures,
 			Lisp_Object *signal_data)
 {
-  if (XFIXNUM (Flength (args)) < 2)
+  if (list_length (args) < 2)
     {
       *signal_data = list2 (build_string ("Predicate `pred' requires "
 					  "at least two arguments, "
-					  "but was only given"),
+					  "but only got"),
 			    Flength (args));
       return false;
     }
@@ -2625,7 +2625,7 @@ treesit_predicate_pred (Lisp_Object args, struct capture_range captures,
   return !NILP (CALLN (Fapply, fn, nodes));
 }
 
-/* If all predicates in PREDICATES passes, return true; otherwise
+/* If all predicates in PREDICATES pass, return true; otherwise
    return false.  If everything goes fine, don't touch SIGNAL_DATA; if
    error occurs, set it to a suitable signal data.  */
 static bool
@@ -2650,7 +2650,7 @@ treesit_eval_predicates (struct capture_range captures, Lisp_Object predicates,
 	{
 	  *signal_data = list3 (build_string ("Invalid predicate"),
 				fn, build_string ("Currently Emacs only supports"
-						  " equal, match, and pred"
+						  " `equal', `match', and `pred'"
 						  " predicates"));
 	  pass = false;
 	}
-- 
2.34.1

In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo
 version 1.16.0, Xaw3d scroll bars) of 2023-06-13 built on blc
Repository revision: 81932ebcfa56a33fcb1c7d9f91094e2b1f6e9b77
Repository branch: blc/treesit/master
Windowing system distributor 'The X.Org Foundation', version 11.0.12101004
System Description: Ubuntu 22.04.2 LTS

Configured using:
 'configure CC=gcc-12 'CFLAGS=-Og -ggdb3' --prefix=/home/bic/.local
 --with-file-notification=yes --with-x --with-x-toolkit=lucid'

Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG
JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NOTIFY
INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF
TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XAW3D XDBE XIM XINPUT2 XPM
LUCID ZLIB

Important settings:
  value of $LC_MONETARY: en_IE.UTF-8
  value of $LC_NUMERIC: en_IE.UTF-8
  value of $LC_TIME: en_IE.UTF-8
  value of $LANG: en_GB.UTF-8
  value of $XMODIFIERS: @im=ibus
  locale-coding-system: utf-8-unix

Major mode: Lisp Interaction

Minor modes in effect:
  tooltip-mode: t
  global-eldoc-mode: t
  eldoc-mode: t
  show-paren-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  tool-bar-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  line-number-mode: t
  indent-tabs-mode: t
  transient-mark-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t

Load-path shadows:
None found.

Features:
(shadow sort mail-extr emacsbug message mailcap yank-media puny dired
dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068
epg-config gnus-util text-property-search time-date subr-x mm-decode
mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader
cl-loaddefs cl-lib sendmail rfc2047 rfc2045 ietf-drums mm-util
mail-prsvr mail-utils rmc iso-transl tooltip cconv eldoc paren electric
uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel
term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image
regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode
prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu
timer select scroll-bar mouse jit-lock font-lock syntax font-core
term/tty-colors frame minibuffer nadvice seq simple cl-generic
indonesian philippine cham georgian utf-8-lang misc-lang vietnamese
tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek
romanian slovak czech european ethiopic indian cyrillic chinese
composite emoji-zwj charscript charprop case-table epa-hook
jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs
theme-loaddefs faces cus-face macroexp files window text-properties
overlay sha1 md5 base64 format env code-pages mule custom widget keymap
hashtable-print-readable backquote threads dbusbind inotify lcms2
dynamic-setting system-font-setting font-render-setting cairo x-toolkit
xinput2 x multi-tty make-network-process emacs)

Memory information:
((conses 16 36740 9186)
 (symbols 48 5178 0)
 (strings 32 13887 1303)
 (string-bytes 1 379577)
 (vectors 16 9299)
 (vector-slots 8 148629 8492)
 (floats 8 23 25)
 (intervals 56 245 0)
 (buffers 984 10))