Re: New tree-sitter mode: bison-ts-mode

[Yuan Fu <casouri@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1415 bytes --]



> On Sep 26, 2023, at 4:52 AM, Augustin Chéneau (BTuin) <btuin@mailo.com> wrote:
> 
> Le 24/09/2023 à 23:10, Yuan Fu a écrit :
>> Actually, a second thought. IIUC the reason for this change is that without these rules, no indentation is done for variable names in code like
>> static myttype *
>> variable_name;
>> static myttype
>> variable_name;
>> This is fine in normal C code, since no indentation is the same as
>> zero indentation, which is what we want.  But for C embedded in Bison,
>> no indentation is not the same as zero indentation.  We want it indent
>> to the top-level indentation of the embedded C. E.g.,
>> {
>>   static myttype
>>   variable_name;
>> }
>> rather than
>> {
>>   static myttype
>> variable_name;
>> }
>> Right? In that case, we should really add a fallback indent rule for the embedded c in bison, such that it indents to the top-level of the embedded c. This is more robust than trying to cover all cases in the c rules. Does that make sense?
>> Basically, add something like
>> (catch-all bison-ts-mode--bison-parent ,bison-ts-mode-indent-offset)
>> To the end of C’s indent rules.
>> Yuan
> 
> It does make sense, thanks.  I updated bison-ts-mode to do that.

Thanks. LGTM except some minor byte-compile warnings. I attached a diff, please see if you like those changes.

Once the paperwork is done I think we are good to go.

Yuan


[-- Attachment #2: bison-comment.diff --]
[-- Type: application/octet-stream, Size: 1582 bytes --]

diff --git a/bison-ts-mode.el b/bison-ts-mode.el.1
index febd2d9..913c1fa 100644
--- a/bison-ts-mode.el
+++ b/bison-ts-mode.el.1
@@ -30,6 +30,8 @@
 
 (require 'treesit)
 (require 'c-ts-common)
+(require 'c-ts-mode) ; For ‘c-ts-mode--get-indent-style’.
+(require 'java-ts-mode) ; For ‘java-ts-mode--indent-rules’.
 
 (declare-function treesit-parser-create "treesit.c")
 (declare-function treesit-induce-sparse-tree "treesit.c")
@@ -62,9 +64,10 @@ It has no effect in the epilogue part of the file."
 
 (defcustom bison-ts-mode-autodetect-language t
   "Search for a %language directive in the file at initialization.
-Changing the value of this directive in the file requires to reload the mode to
-be effective.  If `bison-ts-mode-buffer-language' is set by a file-local
- variable, the auto-detection is not run."
+Changing the value of this directive in the file requires to
+reload the mode to be effective. If
+`bison-ts-mode-buffer-language' is set by a file-local variable,
+the auto-detection is not run."
   :version "30.1"
   :type 'boolean
   :safe 'boolean)
@@ -108,8 +111,8 @@ buffer."
             (group (1+ (in alpha "+")))
             "\"")
            nil
-           t)))
-    (match-string-no-properties 1)))
+           t)
+        (match-string-no-properties 1)))))
 
 
 (defun bison-ts-mode--detect-language (&optional buffer)
@@ -366,4 +369,5 @@ ROOT-NAME is the highest-level node of the embedded language."
     (treesit-major-mode-setup)))
 
 (provide 'bison-ts-mode)
+
 ;;; bison-ts-mode.el ends here

[-- Attachment #3: Type: text/plain, Size: 2 bytes --]