bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Kai Ma]

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

When electric-pair-mode is enabled, a single quote ' should be auto
completed to be '' (which means an empty string).  Python-mode correctly
does this, but python-ts-mode does not.  This is clearly a problem
regarding the syntax table.

The attached patch makes python-ts-mode uses the same syntax table as
python-mode's, and fixes this problem.  I also checked a few other ts
modes, and some also have this issue.  For example, js-ts-mode does not
auto complete '' either, which is also fixed by this patch.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Fix syntax tables of tree-sitter modes --]
[-- Type: text/x-patch, Size: 3727 bytes --]

From 7f996826bc47bcdd155eb0cc220a48c32cb2619a Mon Sep 17 00:00:00 2001
From: Kai Ma <justksqsf@gmail.com>
Date: Sun, 4 Dec 2022 06:15:42 +0800
Subject: [PATCH] Fix syntax tables of tree-sitter modes

Tree-sitter modes should use the same syntax table as the
non-tree-sitter ones.
* lisp/progmodes/csharp-mode.el (csharp-mode-syntax-table)
(csharp-mode):
* lisp/progmodes/js.el (js-mode-syntax-table) (js-ts-mode):
* lisp/progmodes/python.el (python-ts-mode):
* lisp/progmodes/sh-script.el (bash-ts-mode):
* lisp/textmodes/css-mode.el (css-ts-mode):
---
 lisp/progmodes/csharp-mode.el | 3 ++-
 lisp/progmodes/js.el          | 3 ++-
 lisp/progmodes/python.el      | 1 +
 lisp/progmodes/sh-script.el   | 1 +
 lisp/textmodes/css-mode.el    | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el
index 3da3079f08..73f2a6ff9e 100644
--- a/lisp/progmodes/csharp-mode.el
+++ b/lisp/progmodes/csharp-mode.el
@@ -608,7 +608,7 @@ csharp-compilation-re-dotnet-testfail
 
 (defvar csharp-mode-syntax-table
   (funcall (c-lang-const c-make-mode-syntax-table csharp))
-  "Syntax table used in `csharp-mode' buffers.")
+  "Syntax table used in `csharp-mode' and `csharp-ts-mode' buffers.")
 
 (defvar csharp-mode-map
   (let ((map (c-make-inherited-keymap)))
@@ -890,6 +890,7 @@ csharp-mode
 ;;;###autoload
 (define-derived-mode csharp-ts-mode prog-mode "C#"
   "Major mode for editing C# code."
+  :syntax-table csharp-mode-syntax-table
 
   (unless (treesit-ready-p 'c-sharp)
     (error "Tree-sitter for C# isn't available"))
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index ad1fe62d42..11e45178f7 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -686,7 +686,7 @@ js-mode-syntax-table
     (modify-syntax-entry ?$ "_" table)
     (modify-syntax-entry ?` "\"" table)
     table)
-  "Syntax table for `js-mode'.")
+  "Syntax table for `js-mode' and `js-ts-mode'.")
 
 (defvar-local js--quick-match-re nil
   "Autogenerated regexp used by `js-mode' to match buffer constructs.")
@@ -3840,6 +3840,7 @@ js-ts-mode
 
 \\<js-ts-mode-map>"
   :group 'js
+  :syntax-table js-mode-syntax-table
   (when (treesit-ready-p 'javascript)
     ;; Borrowed from `js-mode'.
     (setq-local prettify-symbols-alist js--prettify-symbols-alist)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4fc5d24e2f..c90124b6b9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6618,6 +6618,7 @@ python-ts-mode
   "Major mode for editing Python files, using tree-sitter library.
 
 \\{python-ts-mode-map}"
+  :syntax-table python-mode-syntax-table
   (when (treesit-ready-p 'python)
     (treesit-parser-create 'python)
     (setq-local treesit-font-lock-feature-list
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e170d18afe..76e8d5b074 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1611,6 +1611,7 @@ bash-ts-mode
   "Major mode for editing Bash shell scripts.
 This mode automatically falls back to `sh-mode' if the buffer is
 not written in Bash or sh."
+  :syntax-table sh-mode-syntax-table
   (when (treesit-ready-p 'bash)
     (setq-local treesit-font-lock-feature-list
                 '(( comment function)
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index b82886e397..b3654eaa7f 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1822,6 +1822,7 @@ css-ts-mode
 can also be used to fill comments.
 
 \\{css-mode-map}"
+  :syntax-table css-mode-syntax-table
   (when (treesit-ready-p 'css)
     ;; Borrowed from `css-mode'.
     (add-hook 'completion-at-point-functions
-- 
2.37.1 (Apple Git-137.1)


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


Kai

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Eli Zaretskii]

> From: Kai Ma <justksqsf@gmail.com>
> Date: Sun, 04 Dec 2022 06:27:18 +0800
> 
> When electric-pair-mode is enabled, a single quote ' should be auto
> completed to be '' (which means an empty string).  Python-mode correctly
> does this, but python-ts-mode does not.  This is clearly a problem
> regarding the syntax table.
> 
> The attached patch makes python-ts-mode uses the same syntax table as
> python-mode's, and fixes this problem.  I also checked a few other ts
> modes, and some also have this issue.  For example, js-ts-mode does not
> auto complete '' either, which is also fixed by this patch.
> 
> >From 7f996826bc47bcdd155eb0cc220a48c32cb2619a Mon Sep 17 00:00:00 2001
> From: Kai Ma <justksqsf@gmail.com>
> Date: Sun, 4 Dec 2022 06:15:42 +0800
> Subject: [PATCH] Fix syntax tables of tree-sitter modes
> 
> Tree-sitter modes should use the same syntax table as the
> non-tree-sitter ones.
> * lisp/progmodes/csharp-mode.el (csharp-mode-syntax-table)
> (csharp-mode):
> * lisp/progmodes/js.el (js-mode-syntax-table) (js-ts-mode):
> * lisp/progmodes/python.el (python-ts-mode):
> * lisp/progmodes/sh-script.el (bash-ts-mode):
> * lisp/textmodes/css-mode.el (css-ts-mode):

Thanks, but please format the log message according to our conventions:
there should be a description of the actual changes after the last colon.

Yuan, is it really true that the syntax tables in treesit-supported modes
should be always identical to those of the non-treesit modes?  Or maybe
there could be subtle differences?

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Yuan Fu]

> On Dec 3, 2022, at 11:19 PM, Eli Zaretskii <eliz@gnu.org> wrote:
> 
>> From: Kai Ma <justksqsf@gmail.com>
>> Date: Sun, 04 Dec 2022 06:27:18 +0800
>> 
>> When electric-pair-mode is enabled, a single quote ' should be auto
>> completed to be '' (which means an empty string).  Python-mode correctly
>> does this, but python-ts-mode does not.  This is clearly a problem
>> regarding the syntax table.
>> 
>> The attached patch makes python-ts-mode uses the same syntax table as
>> python-mode's, and fixes this problem.  I also checked a few other ts
>> modes, and some also have this issue.  For example, js-ts-mode does not
>> auto complete '' either, which is also fixed by this patch.
>> 
>>> From 7f996826bc47bcdd155eb0cc220a48c32cb2619a Mon Sep 17 00:00:00 2001
>> From: Kai Ma <justksqsf@gmail.com>
>> Date: Sun, 4 Dec 2022 06:15:42 +0800
>> Subject: [PATCH] Fix syntax tables of tree-sitter modes
>> 
>> Tree-sitter modes should use the same syntax table as the
>> non-tree-sitter ones.
>> * lisp/progmodes/csharp-mode.el (csharp-mode-syntax-table)
>> (csharp-mode):
>> * lisp/progmodes/js.el (js-mode-syntax-table) (js-ts-mode):
>> * lisp/progmodes/python.el (python-ts-mode):
>> * lisp/progmodes/sh-script.el (bash-ts-mode):
>> * lisp/textmodes/css-mode.el (css-ts-mode):
> 
> Thanks, but please format the log message according to our conventions:
> there should be a description of the actual changes after the last colon.
> 
> Yuan, is it really true that the syntax tables in treesit-supported modes
> should be always identical to those of the non-treesit modes?  Or maybe
> there could be subtle differences?

IMO yes. But since I’m not the original author of some of the modes, I included Theo for his opinion.

Yuan

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

On 4 December 2022 08:28:23 CET, Yuan Fu <casouri@gmail.com> wrote:
>
>
>> On Dec 3, 2022, at 11:19 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>> 
>>> From: Kai Ma <justksqsf@gmail.com>
>>> Date: Sun, 04 Dec 2022 06:27:18 +0800
>>> 
>>> When electric-pair-mode is enabled, a single quote ' should be auto
>>> completed to be '' (which means an empty string).  Python-mode correctly
>>> does this, but python-ts-mode does not.  This is clearly a problem
>>> regarding the syntax table.
>>> 
>>> The attached patch makes python-ts-mode uses the same syntax table as
>>> python-mode's, and fixes this problem.  I also checked a few other ts
>>> modes, and some also have this issue.  For example, js-ts-mode does not
>>> auto complete '' either, which is also fixed by this patch.
>>> 
>>>> From 7f996826bc47bcdd155eb0cc220a48c32cb2619a Mon Sep 17 00:00:00 2001
>>> From: Kai Ma <justksqsf@gmail.com>
>>> Date: Sun, 4 Dec 2022 06:15:42 +0800
>>> Subject: [PATCH] Fix syntax tables of tree-sitter modes
>>> 
>>> Tree-sitter modes should use the same syntax table as the
>>> non-tree-sitter ones.
>>> * lisp/progmodes/csharp-mode.el (csharp-mode-syntax-table)
>>> (csharp-mode):
>>> * lisp/progmodes/js.el (js-mode-syntax-table) (js-ts-mode):
>>> * lisp/progmodes/python.el (python-ts-mode):
>>> * lisp/progmodes/sh-script.el (bash-ts-mode):
>>> * lisp/textmodes/css-mode.el (css-ts-mode):
>> 
>> Thanks, but please format the log message according to our conventions:
>> there should be a description of the actual changes after the last colon.
>> 
>> Yuan, is it really true that the syntax tables in treesit-supported modes
>> should be always identical to those of the non-treesit modes?  Or maybe
>> there could be subtle differences?
>
>IMO yes. But since I’m not the original author of some of the modes, I included Theo for his opinion.
>
>Yuan
>

I agree!
Theo

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Kai Ma]

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


> On Dec 4, 2022, at 15:19, Eli Zaretskii <eliz@gnu.org> wrote:
> 
> Thanks, but please format the log message according to our conventions:
> there should be a description of the actual changes after the last colon.

Thanks, descriptions added in the revised patch.



Kai

[-- Attachment #2.1: Type: text/html, Size: 2043 bytes --]

[-- Attachment #2.2: 0001-Fix-syntax-tables-of-tree-sitter-modes.patch --]
[-- Type: application/octet-stream, Size: 3974 bytes --]

From 94e150a2d1a199ac444382c809753fdefa1c1daa Mon Sep 17 00:00:00 2001
From: Kai Ma <justksqsf@gmail.com>
Date: Sun, 4 Dec 2022 06:15:42 +0800
Subject: [PATCH] Fix syntax tables of tree-sitter modes

Tree-sitter modes should use the same syntax table as the
non-tree-sitter ones.
* lisp/progmodes/csharp-mode.el (csharp-mode-syntax-table): Change
docstring.
(csharp-mode): Add ':syntax-table'.
* lisp/progmodes/js.el (js-mode-syntax-table): Change docstring.
(js-ts-mode): Add ':syntax-table'.
* lisp/progmodes/python.el (python-ts-mode): Add ':syntax-table'.
* lisp/progmodes/sh-script.el (bash-ts-mode): Add ':syntax-table'.
* lisp/textmodes/css-mode.el (css-ts-mode): Add ':syntax-table'.
---
 lisp/progmodes/csharp-mode.el | 3 ++-
 lisp/progmodes/js.el          | 3 ++-
 lisp/progmodes/python.el      | 1 +
 lisp/progmodes/sh-script.el   | 1 +
 lisp/textmodes/css-mode.el    | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el
index 3da3079f08..73f2a6ff9e 100644
--- a/lisp/progmodes/csharp-mode.el
+++ b/lisp/progmodes/csharp-mode.el
@@ -608,7 +608,7 @@ csharp-compilation-re-dotnet-testfail
 
 (defvar csharp-mode-syntax-table
   (funcall (c-lang-const c-make-mode-syntax-table csharp))
-  "Syntax table used in `csharp-mode' buffers.")
+  "Syntax table used in `csharp-mode' and `csharp-ts-mode' buffers.")
 
 (defvar csharp-mode-map
   (let ((map (c-make-inherited-keymap)))
@@ -890,6 +890,7 @@ csharp-mode
 ;;;###autoload
 (define-derived-mode csharp-ts-mode prog-mode "C#"
   "Major mode for editing C# code."
+  :syntax-table csharp-mode-syntax-table
 
   (unless (treesit-ready-p 'c-sharp)
     (error "Tree-sitter for C# isn't available"))
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index ad1fe62d42..11e45178f7 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -686,7 +686,7 @@ js-mode-syntax-table
     (modify-syntax-entry ?$ "_" table)
     (modify-syntax-entry ?` "\"" table)
     table)
-  "Syntax table for `js-mode'.")
+  "Syntax table for `js-mode' and `js-ts-mode'.")
 
 (defvar-local js--quick-match-re nil
   "Autogenerated regexp used by `js-mode' to match buffer constructs.")
@@ -3840,6 +3840,7 @@ js-ts-mode
 
 \\<js-ts-mode-map>"
   :group 'js
+  :syntax-table js-mode-syntax-table
   (when (treesit-ready-p 'javascript)
     ;; Borrowed from `js-mode'.
     (setq-local prettify-symbols-alist js--prettify-symbols-alist)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4fc5d24e2f..c90124b6b9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6618,6 +6618,7 @@ python-ts-mode
   "Major mode for editing Python files, using tree-sitter library.
 
 \\{python-ts-mode-map}"
+  :syntax-table python-mode-syntax-table
   (when (treesit-ready-p 'python)
     (treesit-parser-create 'python)
     (setq-local treesit-font-lock-feature-list
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e170d18afe..76e8d5b074 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1611,6 +1611,7 @@ bash-ts-mode
   "Major mode for editing Bash shell scripts.
 This mode automatically falls back to `sh-mode' if the buffer is
 not written in Bash or sh."
+  :syntax-table sh-mode-syntax-table
   (when (treesit-ready-p 'bash)
     (setq-local treesit-font-lock-feature-list
                 '(( comment function)
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index b82886e397..b3654eaa7f 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1822,6 +1822,7 @@ css-ts-mode
 can also be used to fill comments.
 
 \\{css-mode-map}"
+  :syntax-table css-mode-syntax-table
   (when (treesit-ready-p 'css)
     ;; Borrowed from `css-mode'.
     (add-hook 'completion-at-point-functions
-- 
2.37.1 (Apple Git-137.1)


[-- Attachment #2.3: Type: text/html, Size: 241 bytes --]

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Yuan Fu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Kai Ma <justksqsf@gmail.com> writes:

>  On Dec 4, 2022, at 15:19, Eli Zaretskii <eliz@gnu.org> wrote:
>
>  Thanks, but please format the log message according to our conventions:
>  there should be a description of the actual changes after the last colon.
>
> Thanks, descriptions added in the revised patch.

Looks good, thanks. Have you signed the copyright assignment? (BTW, Eli,
what’s the standard way for checking this?)

Yuan

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Kai Ma]

> On Dec 5, 2022, at 14:28, Yuan Fu <yuf011@ucsd.edu> wrote:
> 
> Kai Ma <justksqsf@gmail.com> writes:
> 
>> On Dec 4, 2022, at 15:19, Eli Zaretskii <eliz@gnu.org> wrote:
>> 
>> Thanks, but please format the log message according to our conventions:
>> there should be a description of the actual changes after the last colon.
>> 
>> Thanks, descriptions added in the revised patch.
> 
> Looks good, thanks. Have you signed the copyright assignment? (BTW, Eli,
> what’s the standard way for checking this?)

No, I haven’t.  Thanks for the heads up.
I’ve just started the CA process according to CONTRIBUTE.  
Will let you know when I’m done.

Kai

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Eli Zaretskii]

On December 5, 2022 8:28:10 AM GMT+02:00, Yuan Fu <yuf011@ucsd.edu> wrote:
> 
> Kai Ma <justksqsf@gmail.com> writes:
> 
> >  On Dec 4, 2022, at 15:19, Eli Zaretskii <eliz@gnu.org> wrote:
> >
> >  Thanks, but please format the log message according to our conventions:
> >  there should be a description of the actual changes after the last colon.
> >
> > Thanks, descriptions added in the revised patch.
> 
> Looks good, thanks. Have you signed the copyright assignment? (BTW, Eli,
> what’s the standard way for checking this?)
> 
> Yuan
> 

The standard way is to ask me.

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Kai Ma]

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



> On Dec 5, 2022, at 14:48, Kai Ma <justksqsf@gmail.com> wrote:
> 
> No, I haven’t.  Thanks for the heads up.
> I’ve just started the CA process according to CONTRIBUTE.  
> Will let you know when I’m done.

Sorry for the delay.

Unfortunately, I cannot complete the assignment process, at least for now. The licensing officer at my university is really reluctant to sign a copyright disclaimer for me.

However, the cumulative number of lines changed by me is below 15 so far, so at least for this issue, we can move forward. I’ve added Copyright-paperwork-exempt in the attached patch.



[-- Attachment #2.1: Type: text/html, Size: 3076 bytes --]

[-- Attachment #2.2: 0001-Fix-syntax-tables-of-tree-sitter-modes.patch --]
[-- Type: application/octet-stream, Size: 4009 bytes --]

From 94e150a2d1a199ac444382c809753fdefa1c1daa Mon Sep 17 00:00:00 2001
From: Kai Ma <justksqsf@gmail.com>
Date: Sun, 4 Dec 2022 06:15:42 +0800
Subject: [PATCH] Fix syntax tables of tree-sitter modes

Tree-sitter modes should use the same syntax table as the
non-tree-sitter ones.
* lisp/progmodes/csharp-mode.el (csharp-mode-syntax-table): Change
docstring.
(csharp-mode): Add ':syntax-table'.
* lisp/progmodes/js.el (js-mode-syntax-table): Change docstring.
(js-ts-mode): Add ':syntax-table'.
* lisp/progmodes/python.el (python-ts-mode): Add ':syntax-table'.
* lisp/progmodes/sh-script.el (bash-ts-mode): Add ':syntax-table'.
* lisp/textmodes/css-mode.el (css-ts-mode): Add ':syntax-table'.

Copyright-paperwork-exempt: yes
---
 lisp/progmodes/csharp-mode.el | 3 ++-
 lisp/progmodes/js.el          | 3 ++-
 lisp/progmodes/python.el      | 1 +
 lisp/progmodes/sh-script.el   | 1 +
 lisp/textmodes/css-mode.el    | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el
index 3da3079f08..73f2a6ff9e 100644
--- a/lisp/progmodes/csharp-mode.el
+++ b/lisp/progmodes/csharp-mode.el
@@ -608,7 +608,7 @@ csharp-compilation-re-dotnet-testfail
 
 (defvar csharp-mode-syntax-table
   (funcall (c-lang-const c-make-mode-syntax-table csharp))
-  "Syntax table used in `csharp-mode' buffers.")
+  "Syntax table used in `csharp-mode' and `csharp-ts-mode' buffers.")
 
 (defvar csharp-mode-map
   (let ((map (c-make-inherited-keymap)))
@@ -890,6 +890,7 @@ csharp-mode
 ;;;###autoload
 (define-derived-mode csharp-ts-mode prog-mode "C#"
   "Major mode for editing C# code."
+  :syntax-table csharp-mode-syntax-table
 
   (unless (treesit-ready-p 'c-sharp)
     (error "Tree-sitter for C# isn't available"))
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index ad1fe62d42..11e45178f7 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -686,7 +686,7 @@ js-mode-syntax-table
     (modify-syntax-entry ?$ "_" table)
     (modify-syntax-entry ?` "\"" table)
     table)
-  "Syntax table for `js-mode'.")
+  "Syntax table for `js-mode' and `js-ts-mode'.")
 
 (defvar-local js--quick-match-re nil
   "Autogenerated regexp used by `js-mode' to match buffer constructs.")
@@ -3840,6 +3840,7 @@ js-ts-mode
 
 \\<js-ts-mode-map>"
   :group 'js
+  :syntax-table js-mode-syntax-table
   (when (treesit-ready-p 'javascript)
     ;; Borrowed from `js-mode'.
     (setq-local prettify-symbols-alist js--prettify-symbols-alist)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4fc5d24e2f..c90124b6b9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6618,6 +6618,7 @@ python-ts-mode
   "Major mode for editing Python files, using tree-sitter library.
 
 \\{python-ts-mode-map}"
+  :syntax-table python-mode-syntax-table
   (when (treesit-ready-p 'python)
     (treesit-parser-create 'python)
     (setq-local treesit-font-lock-feature-list
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e170d18afe..76e8d5b074 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1611,6 +1611,7 @@ bash-ts-mode
   "Major mode for editing Bash shell scripts.
 This mode automatically falls back to `sh-mode' if the buffer is
 not written in Bash or sh."
+  :syntax-table sh-mode-syntax-table
   (when (treesit-ready-p 'bash)
     (setq-local treesit-font-lock-feature-list
                 '(( comment function)
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index b82886e397..b3654eaa7f 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1822,6 +1822,7 @@ css-ts-mode
 can also be used to fill comments.
 
 \\{css-mode-map}"
+  :syntax-table css-mode-syntax-table
   (when (treesit-ready-p 'css)
     ;; Borrowed from `css-mode'.
     (add-hook 'completion-at-point-functions
-- 
2.37.1 (Apple Git-137.1)


[-- Attachment #2.3: Type: text/html, Size: 212 bytes --]

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Stefan Kangas]

Kai Ma <justksqsf@gmail.com> writes:

> Unfortunately, I cannot complete the assignment process, at least for
> now. The licensing officer at my university is really reluctant to
> sign a copyright disclaimer for me.

Thanks for trying.

> However, the cumulative number of lines changed by me is below 15 so
> far, so at least for this issue, we can move forward. I’ve added
> Copyright-paperwork-exempt in the attached patch.

-ENOPATCH

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Yuan Fu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

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



> On Dec 12, 2022, at 6:24 PM, Stefan Kangas <stefankangas@gmail.com> wrote:
> 
> Kai Ma <justksqsf@gmail.com> writes:
> 
>> Unfortunately, I cannot complete the assignment process, at least for
>> now. The licensing officer at my university is really reluctant to
>> sign a copyright disclaimer for me.
> 
> Thanks for trying.

Yes, thanks!

> 
>> However, the cumulative number of lines changed by me is below 15 so
>> far, so at least for this issue, we can move forward. I’ve added
>> Copyright-paperwork-exempt in the attached patch.
> 
> -ENOPATCH
> 

I can see his patch. I attached it below.

Yuan


[-- Attachment #2: 0001-Fix-syntax-tables-of-tree-sitter-modes.patch --]
[-- Type: application/octet-stream, Size: 4009 bytes --]

From 94e150a2d1a199ac444382c809753fdefa1c1daa Mon Sep 17 00:00:00 2001
From: Kai Ma <justksqsf@gmail.com>
Date: Sun, 4 Dec 2022 06:15:42 +0800
Subject: [PATCH] Fix syntax tables of tree-sitter modes

Tree-sitter modes should use the same syntax table as the
non-tree-sitter ones.
* lisp/progmodes/csharp-mode.el (csharp-mode-syntax-table): Change
docstring.
(csharp-mode): Add ':syntax-table'.
* lisp/progmodes/js.el (js-mode-syntax-table): Change docstring.
(js-ts-mode): Add ':syntax-table'.
* lisp/progmodes/python.el (python-ts-mode): Add ':syntax-table'.
* lisp/progmodes/sh-script.el (bash-ts-mode): Add ':syntax-table'.
* lisp/textmodes/css-mode.el (css-ts-mode): Add ':syntax-table'.

Copyright-paperwork-exempt: yes
---
 lisp/progmodes/csharp-mode.el | 3 ++-
 lisp/progmodes/js.el          | 3 ++-
 lisp/progmodes/python.el      | 1 +
 lisp/progmodes/sh-script.el   | 1 +
 lisp/textmodes/css-mode.el    | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el
index 3da3079f08..73f2a6ff9e 100644
--- a/lisp/progmodes/csharp-mode.el
+++ b/lisp/progmodes/csharp-mode.el
@@ -608,7 +608,7 @@ csharp-compilation-re-dotnet-testfail
 
 (defvar csharp-mode-syntax-table
   (funcall (c-lang-const c-make-mode-syntax-table csharp))
-  "Syntax table used in `csharp-mode' buffers.")
+  "Syntax table used in `csharp-mode' and `csharp-ts-mode' buffers.")
 
 (defvar csharp-mode-map
   (let ((map (c-make-inherited-keymap)))
@@ -890,6 +890,7 @@ csharp-mode
 ;;;###autoload
 (define-derived-mode csharp-ts-mode prog-mode "C#"
   "Major mode for editing C# code."
+  :syntax-table csharp-mode-syntax-table
 
   (unless (treesit-ready-p 'c-sharp)
     (error "Tree-sitter for C# isn't available"))
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index ad1fe62d42..11e45178f7 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -686,7 +686,7 @@ js-mode-syntax-table
     (modify-syntax-entry ?$ "_" table)
     (modify-syntax-entry ?` "\"" table)
     table)
-  "Syntax table for `js-mode'.")
+  "Syntax table for `js-mode' and `js-ts-mode'.")
 
 (defvar-local js--quick-match-re nil
   "Autogenerated regexp used by `js-mode' to match buffer constructs.")
@@ -3840,6 +3840,7 @@ js-ts-mode
 
 \\<js-ts-mode-map>"
   :group 'js
+  :syntax-table js-mode-syntax-table
   (when (treesit-ready-p 'javascript)
     ;; Borrowed from `js-mode'.
     (setq-local prettify-symbols-alist js--prettify-symbols-alist)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4fc5d24e2f..c90124b6b9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6618,6 +6618,7 @@ python-ts-mode
   "Major mode for editing Python files, using tree-sitter library.
 
 \\{python-ts-mode-map}"
+  :syntax-table python-mode-syntax-table
   (when (treesit-ready-p 'python)
     (treesit-parser-create 'python)
     (setq-local treesit-font-lock-feature-list
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e170d18afe..76e8d5b074 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1611,6 +1611,7 @@ bash-ts-mode
   "Major mode for editing Bash shell scripts.
 This mode automatically falls back to `sh-mode' if the buffer is
 not written in Bash or sh."
+  :syntax-table sh-mode-syntax-table
   (when (treesit-ready-p 'bash)
     (setq-local treesit-font-lock-feature-list
                 '(( comment function)
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index b82886e397..b3654eaa7f 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1822,6 +1822,7 @@ css-ts-mode
 can also be used to fill comments.
 
 \\{css-mode-map}"
+  :syntax-table css-mode-syntax-table
   (when (treesit-ready-p 'css)
     ;; Borrowed from `css-mode'.
     (add-hook 'completion-at-point-functions
-- 
2.37.1 (Apple Git-137.1)

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Eli Zaretskii]

> From: Kai Ma <justksqsf@gmail.com>
> Date: Tue, 13 Dec 2022 09:20:52 +0800
> Cc: Eli Zaretskii <eliz@gnu.org>,
>  59807@debbugs.gnu.org
> 
> Unfortunately, I cannot complete the assignment process, at least for now. The licensing officer at my university is really reluctant to sign a copyright disclaimer for me.
> 
> However, the cumulative number of lines changed by me is below 15 so far, so at least for this issue, we can move forward. I’ve added Copyright-paperwork-exempt in the attached patch.

Yes, we can still accept this one, but it will probably be the last
one.

bug#59807: 29.0.60; [PATCH] python-ts-mode does not auto-complete the closing quote

[Yuan Fu]

Yuan Fu <yuf011@ucsd.edu> writes:

>> On Dec 12, 2022, at 6:24 PM, Stefan Kangas <stefankangas@gmail.com> wrote:
>> 
>> Kai Ma <justksqsf@gmail.com> writes:
>> 
>>> Unfortunately, I cannot complete the assignment process, at least for
>>> now. The licensing officer at my university is really reluctant to
>>> sign a copyright disclaimer for me.
>> 
>> Thanks for trying.
>
> Yes, thanks!
>
>> 
>>> However, the cumulative number of lines changed by me is below 15 so
>>> far, so at least for this issue, we can move forward. I’ve added
>>> Copyright-paperwork-exempt in the attached patch.
>> 
>> -ENOPATCH
>> 
>
> I can see his patch. I attached it below.

I applied the patch. Due to recent changes on the branch I needed to
modify it a little.  As a result, the patch contains fewer lines of
change.

Yuan