bug#61006: 29.0.60; Wrong indentation in go-ts-mode

bug#61006: 29.0.60; Wrong indentation in go-ts-mode

[sskostyaev]

Hi. Thank you all for great work.
In go-ts-mode indentation breaks in function or method definition if
arguments placed on separate lines like this:
```
func transform(
s string,
) string {
```
This code should be indented like this:
```
func transform(
	s string,
) string {
```
Also `go-ts-mode-indent-offset' should be 8 by default. In go world
there is gofmt which is a real standart for code indentation. It would
be great if emacs will provide the same indentation out of the box.

There is also other issue - sometimes go-ts-mode syntax highliting
breaks when I actively use it with `lsp-mode` - refactorings, auto
formatting etc. But I can't reproduce it with `eglot`.

In GNU Emacs 29.0.60 (build 1, x86_64-pc-linux-gnu, GTK+ Version
 3.24.36, cairo version 1.17.6) of 2023-01-11 built on feofanlaptop
Repository revision: 384504edf35751eec2be9b52be5d3b250217d68f
Repository branch: makepkg
System Description: Arch Linux

Configured using:
 'configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
 --localstatedir=/var --mandir=/usr/share/man --with-gameuser=:games
 --with-modules --without-libotf --without-m17n-flt --without-gconf
 --with-native-compilation=yes --with-native-compilation=aot --with-
pgtk
 --without-xaw3d --with-sound=no --with-tree-sitter --without-gpm
 --without-compress-install
 '--program-transform-name=s/\([ec]tags\)/\1.emacs/'
 'CFLAGS=-march=x86-64 -mtune=generic -O2 -pipe -fno-plt'
 CPPFLAGS=-D_FORTIFY_SOURCE=2
 LDFLAGS=-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now'

Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG
JSON
LCMS2 LIBSYSTEMD LIBXML2 MODULES NATIVE_COMP NOTIFY INOTIFY PDUMPER
PGTK
PNG RSVG SECCOMP SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER
WEBP XIM GTK3 ZLIB

Important settings:
  value of $LC_ALL: en_US.UTF-8
  value of $LANG: ru_RU.UTF-8
  value of $XMODIFIERS: @im=ibus
  locale-coding-system: utf-8-unix

Major mode: Go

Minor modes in effect:
  shell-dirtrack-mode: t
  eglot--managed-mode: t
  pixel-scroll-precision-mode: t
  flymake-mode: t
  icomplete-vertical-mode: t
  icomplete-mode: t
  electric-pair-mode: t
  tooltip-mode: t
  global-eldoc-mode: t
  eldoc-mode: t
  show-paren-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-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 find-dired go-ts-mode treesit face-
remap
display-line-numbers files-x hippie-exp misearch multi-isearch shell
pcomplete vc-dir log-edit message sendmail mailcap yank-media puny
dired
dired-loaddefs rfc822 mml mml-sec epa epg rfc6068 epg-config gnus-util
mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 mm-
util
ietf-drums mail-prsvr mailabbrev mail-utils gmm-utils mailheader add-
log
vc-hg vc-bzr vc-src vc-sccs vc-cvs vc-rcs log-view pcvs-util smerge-
mode
diff vc vc-git diff-mode vc-dispatcher tabify apropos cus-edit cus-
start
cus-load wid-edit time dune skeleton vc-svn eglot external-completion
array filenotify jsonrpc ert ewoc debug backtrace url-util url-parse
auth-source eieio eieio-core password-cache json map url-vars imenu
tuareg tuareg-compat tuareg-opam smie find-file pixel-scroll cua-base
gopcaml-mode merlin-xref xref merlin-cap merlin easy-mmode advice pcase
crm ocp-indent cl gopcaml bookmark pp edmacro kmacro derived find-func
use-package-core time-date checkdoc lisp-mnt flymake-proc flymake
project byte-opt compile text-property-search comint ansi-osc ansi-
color
ring thingatpt comp comp-cstr warnings icons subr-x rx cl-seq cl-macs
gv
cl-extra help-mode bytecomp byte-compile icomplete cl-loaddefs cl-lib
elec-pair misterioso-theme rmc iso-transl tooltip cconv eldoc paren
electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel
term/pgtk-win pgtk-win term/common-win pgtk-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
dynamic-setting system-font-setting font-render-setting cairo gtk pgtk
lcms2 multi-tty make-network-process native-compile emacs)

Memory information:
((conses 16 324901 69046)
 (symbols 48 17609 6)
 (strings 32 55854 8316)
 (string-bytes 1 1941813)
 (vectors 16 45873)
 (vector-slots 8 1509242 228698)
 (floats 8 261 571)
 (intervals 56 23782 309)
 (buffers 984 54))

-- 
Best regards,
Sergey Kostyaev

bug#61006: 29.0.60; Wrong indentation in go-ts-mode

[Randy Taylor]

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

On Sunday, January 22nd, 2023 at 05:00, sskostyaev@gmail.com <sskostyaev@gmail.com> wrote:
> 
> Hi. Thank you all for great work.
> In go-ts-mode indentation breaks in function or method definition if
> arguments placed on separate lines like this:
> `func transform( s string, ) string {`
> This code should be indented like this:
> `func transform( s string, ) string {`

Thanks for the report. I've attached a patch that fixes this.

> Also `go-ts-mode-indent-offset' should be 8 by default. In go world there is gofmt which is a real standart for code indentation. It would be great if emacs will provide the same indentation out of the box.

And addresses this.

> There is also other issue - sometimes go-ts-mode syntax highliting breaks when I actively use it with` lsp-mode`- refactorings, auto formatting etc. But I can't reproduce it with`eglot`.

Seems like an `lsp-mode` problem then? I only use `eglot` and haven't noticed anything amiss.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-go-ts-mode-parameter-indentation-and-set-indent-.patch --]
[-- Type: text/x-patch; name=0001-Fix-go-ts-mode-parameter-indentation-and-set-indent-.patch, Size: 1474 bytes --]

From 6595a4592c2ea2d9cff4203d53d91dccae8dc1cd Mon Sep 17 00:00:00 2001
From: Randy Taylor <dev@rjt.dev>
Date: Tue, 24 Jan 2023 21:20:48 -0500
Subject: [PATCH] Fix go-ts-mode parameter indentation and set indent offset to
 8

* lisp/progmodes/go-ts-mode.el (go-ts-mode-indent-offset): Change it
to 8.
(go-ts-mode--indent-rules): Add indentation for parameters.

(Bug#61006)
---
 lisp/progmodes/go-ts-mode.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/go-ts-mode.el b/lisp/progmodes/go-ts-mode.el
index d552e1360e0..5a97aa5d680 100644
--- a/lisp/progmodes/go-ts-mode.el
+++ b/lisp/progmodes/go-ts-mode.el
@@ -38,7 +38,7 @@
 (declare-function treesit-node-type "treesit.c")
 (declare-function treesit-search-subtree "treesit.c")
 
-(defcustom go-ts-mode-indent-offset 4
+(defcustom go-ts-mode-indent-offset 8
   "Number of spaces for each indentation step in `go-ts-mode'."
   :version "29.1"
   :type 'integer
@@ -80,6 +80,7 @@ go-ts-mode--indent-rules
      ((parent-is "import_spec_list") parent-bol go-ts-mode-indent-offset)
      ((parent-is "labeled_statement") parent-bol go-ts-mode-indent-offset)
      ((parent-is "literal_value") parent-bol go-ts-mode-indent-offset)
+     ((parent-is "parameter_list") parent-bol go-ts-mode-indent-offset)
      ((parent-is "type_spec") parent-bol go-ts-mode-indent-offset)
      ((parent-is "var_declaration") parent-bol go-ts-mode-indent-offset)
      (no-node parent-bol 0)))
-- 
2.39.1

bug#61006: 29.0.60; Wrong indentation in go-ts-mode

[Randy Taylor]

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

On Tuesday, January 24th, 2023 at 21:35, Randy Taylor <dev@rjt.dev> wrote:
> 
> On Sunday, January 22nd, 2023 at 05:00, sskostyaev@gmail.com sskostyaev@gmail.com wrote:
> 
> > Hi. Thank you all for great work.
> > In go-ts-mode indentation breaks in function or method definition if
> > arguments placed on separate lines like this:
> > `func transform( s string, ) string {`
> > This code should be indented like this:
> > `func transform( s string, ) string {`
> 
> 
> Thanks for the report. I've attached a patch that fixes this.
> 
> > Also `go-ts-mode-indent-offset' should be 8 by default. In go world there is gofmt which is a real standart for code indentation. It would be great if emacs will provide the same indentation out of the box.
> 
> 
> And addresses this.
> 
> > There is also other issue - sometimes go-ts-mode syntax highliting breaks when I actively use it with `lsp-mode`- refactorings, auto formatting etc. But I can't reproduce it with`eglot`.
> 
> 
> Seems like an `lsp-mode` problem then? I only use `eglot` and haven't noticed anything amiss.

Addendum to my last patch: added indentation support for interfaces as it was missing. Everything else is the same.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-go-ts-mode-indentation-and-set-indent-offset-to-.patch --]
[-- Type: text/x-patch; name=0001-Fix-go-ts-mode-indentation-and-set-indent-offset-to-.patch, Size: 1697 bytes --]

From ee72f3ce9afa723ecccc199ed398715ea094d816 Mon Sep 17 00:00:00 2001
From: Randy Taylor <dev@rjt.dev>
Date: Tue, 24 Jan 2023 21:20:48 -0500
Subject: [PATCH] Fix go-ts-mode indentation and set indent offset to 8
 (Bug#61006)

* lisp/progmodes/go-ts-mode.el (go-ts-mode-indent-offset): Change it
to 8.
(go-ts-mode--indent-rules): Add indentation for parameters and interfaces.
---
 lisp/progmodes/go-ts-mode.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/go-ts-mode.el b/lisp/progmodes/go-ts-mode.el
index d552e1360e0..5f3e1ea3e68 100644
--- a/lisp/progmodes/go-ts-mode.el
+++ b/lisp/progmodes/go-ts-mode.el
@@ -38,7 +38,7 @@
 (declare-function treesit-node-type "treesit.c")
 (declare-function treesit-search-subtree "treesit.c")
 
-(defcustom go-ts-mode-indent-offset 4
+(defcustom go-ts-mode-indent-offset 8
   "Number of spaces for each indentation step in `go-ts-mode'."
   :version "29.1"
   :type 'integer
@@ -78,8 +78,10 @@ go-ts-mode--indent-rules
      ((parent-is "expression_switch_statement") parent-bol 0)
      ((parent-is "field_declaration_list") parent-bol go-ts-mode-indent-offset)
      ((parent-is "import_spec_list") parent-bol go-ts-mode-indent-offset)
+     ((parent-is "interface_type") parent-bol go-ts-mode-indent-offset)
      ((parent-is "labeled_statement") parent-bol go-ts-mode-indent-offset)
      ((parent-is "literal_value") parent-bol go-ts-mode-indent-offset)
+     ((parent-is "parameter_list") parent-bol go-ts-mode-indent-offset)
      ((parent-is "type_spec") parent-bol go-ts-mode-indent-offset)
      ((parent-is "var_declaration") parent-bol go-ts-mode-indent-offset)
      (no-node parent-bol 0)))
-- 
2.39.1

bug#61006: 29.0.60; Wrong indentation in go-ts-mode

[sskostyaev]

Thank you!

Fixed now.

В Ср, 25/01/2023 в 02:46 +0000, Randy Taylor пишет:
> On Tuesday, January 24th, 2023 at 21:35, Randy Taylor <dev@rjt.dev>
> wrote:
> > 
> > On Sunday, January 22nd, 2023 at 05:00,
> > sskostyaev@gmail.com sskostyaev@gmail.com wrote:
> > 
> > > Hi. Thank you all for great work.
> > > In go-ts-mode indentation breaks in function or method definition
> > > if
> > > arguments placed on separate lines like this:
> > > `func transform( s string, ) string {`
> > > This code should be indented like this:
> > > `func transform( s string, ) string {`
> > 
> > 
> > Thanks for the report. I've attached a patch that fixes this.
> > 
> > > Also `go-ts-mode-indent-offset' should be 8 by default. In go
> > > world there is gofmt which is a real standart for code
> > > indentation. It would be great if emacs will provide the same
> > > indentation out of the box.
> > 
> > 
> > And addresses this.
> > 
> > > There is also other issue - sometimes go-ts-mode syntax
> > > highliting breaks when I actively use it with `lsp-mode`-
> > > refactorings, auto formatting etc. But I can't reproduce it
> > > with`eglot`.
> > 
> > 
> > Seems like an `lsp-mode` problem then? I only use `eglot` and
> > haven't noticed anything amiss.
> 
> Addendum to my last patch: added indentation support for interfaces
> as it was missing. Everything else is the same.


-- 


Best regards,
Sergey Kostyaev

bug#61006: 29.0.60; Wrong indentation in go-ts-mode

[Randy Taylor]

On Tuesday, January 24th, 2023 at 23:06, sskostyaev@gmail.com <sskostyaev@gmail.com> wrote:
> 
> Thank you!
> 
> Fixed now.

Thanks for testing. Can someone install the patch to emacs-29?

> 
> В Ср, 25/01/2023 в 02:46 +0000, Randy Taylor пишет:
> 
> > On Tuesday, January 24th, 2023 at 21:35, Randy Taylor dev@rjt.dev
> > wrote:
> > 
> > > On Sunday, January 22nd, 2023 at 05:00,
> > > sskostyaev@gmail.com sskostyaev@gmail.com wrote:
> > > 
> > > > Hi. Thank you all for great work.
> > > > In go-ts-mode indentation breaks in function or method definition
> > > > if
> > > > arguments placed on separate lines like this:
> > > > `func transform( s string, ) string {`
> > > > This code should be indented like this:
> > > > `func transform( s string, ) string {`
> > > 
> > > Thanks for the report. I've attached a patch that fixes this.
> > > 
> > > > Also `go-ts-mode-indent-offset' should be 8 by default. In go
> > > > world there is gofmt which is a real standart for code
> > > > indentation. It would be great if emacs will provide the same
> > > > indentation out of the box.
> > > 
> > > And addresses this.
> > > 
> > > > There is also other issue - sometimes go-ts-mode syntax
> > > > highliting breaks when I actively use it with `lsp-mode`-
> > > > refactorings, auto formatting etc. But I can't reproduce it
> > > > with`eglot`.
> > > 
> > > Seems like an `lsp-mode` problem then? I only use `eglot` and
> > > haven't noticed anything amiss.
> > 
> > Addendum to my last patch: added indentation support for interfaces
> > as it was missing. Everything else is the same.

bug#61006: 29.0.60; Wrong indentation in go-ts-mode

[Eli Zaretskii]

> Cc: 61006@debbugs.gnu.org
> Date: Thu, 26 Jan 2023 02:39:46 +0000
> From: Randy Taylor <dev@rjt.dev>
> 
> On Tuesday, January 24th, 2023 at 23:06, sskostyaev@gmail.com <sskostyaev@gmail.com> wrote:
> > 
> > Thank you!
> > 
> > Fixed now.
> 
> Thanks for testing. Can someone install the patch to emacs-29?

Done, thanks.

bug#61006: 29.0.60; Wrong indentation in go-ts-mode

[sskostyaev]

В Ср, 25/01/2023 в 02:35 +0000, Randy Taylor пишет:
> On Sunday, January 22nd, 2023 at 05:00,
> sskostyaev@gmail.com <sskostyaev@gmail.com> wrote:
> 
> 
> > There is also other issue - sometimes go-ts-mode syntax highliting
> > breaks when I actively use it with` lsp-mode`- refactorings, auto
> > formatting etc. But I can't reproduce it with`eglot`.
> 
> Seems like an `lsp-mode` problem then? I only use `eglot` and haven't
> noticed anything amiss.

I have reproduced this issue with eglot. But I can't share my working
code screenshots and can't provide easy way to reproduce. Not sure how
can I help to localize the problem then. This issue is not related to
indentation.

bug#61006: 29.0.60; Wrong indentation in go-ts-mode

[sskostyaev]

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

В Ср, 25/01/2023 в 16:54 +0700, sskostyaev@gmail.com пишет:
> В Ср, 25/01/2023 в 02:35 +0000, Randy Taylor пишет:
> > On Sunday, January 22nd, 2023 at 05:00,
> > sskostyaev@gmail.com <sskostyaev@gmail.com> wrote:
> > 
> > 
> > > There is also other issue - sometimes go-ts-mode syntax
> > > highliting
> > > breaks when I actively use it with` lsp-mode`- refactorings, auto
> > > formatting etc. But I can't reproduce it with`eglot`.
> > 
> > Seems like an `lsp-mode` problem then? I only use `eglot` and
> > haven't
> > noticed anything amiss.
> 
> I have reproduced this issue with eglot. But I can't share my working
> code screenshots and can't provide easy way to reproduce. Not sure
> how
> can I help to localize the problem then. This issue is not related to
> indentation.

Screenshot attached.
-- 
Best Regards,
Sergey Kostyaev

[-- Attachment #2: go-ts-mode-broken-hl.png --]
[-- Type: image/png, Size: 61624 bytes --]

bug#61006: 29.0.60; Wrong indentation in go-ts-mode

[Randy Taylor]

On Wednesday, January 25th, 2023 at 05:13, sskostyaev@gmail.com <sskostyaev@gmail.com> wrote:
> 
> В Ср, 25/01/2023 в 16:54 +0700, sskostyaev@gmail.com пишет:
> 
> > В Ср, 25/01/2023 в 02:35 +0000, Randy Taylor пишет:
> > 
> > > On Sunday, January 22nd, 2023 at 05:00,
> > > sskostyaev@gmail.com sskostyaev@gmail.com wrote:
> > > 
> > > > There is also other issue - sometimes go-ts-mode syntax
> > > > highliting
> > > > breaks when I actively use it with `lsp-mode`- refactorings, auto
> > > > formatting etc. But I can't reproduce it with`eglot`.
> > > 
> > > Seems like an `lsp-mode` problem then? I only use `eglot` and
> > > haven't
> > > noticed anything amiss.
> > 
> > I have reproduced this issue with eglot. But I can't share my working
> > code screenshots and can't provide easy way to reproduce. Not sure
> > how
> > can I help to localize the problem then. This issue is not related to
> > indentation.
> 
> 
> Screenshot attached.
> --
> Best Regards,
> Sergey Kostyaev

Thanks. Can you please open a new bug for this? Please also see if you can reproduce it with emacs -Q. We can continue the discussion in the new bug.

bug#61006: 29.0.60; Wrong indentation in go-ts-mode

[Sergey Kostyaev]

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

I will try to reproduce it with emacs -Q and then fill new bug. Thank you.

--
Best regards,
Sergey Kostyaev

26 января 2023 г. 02:41:33 UTC, Randy Taylor <dev@rjt.dev> пишет:
>On Wednesday, January 25th, 2023 at 05:13, sskostyaev@gmail.com <sskostyaev@gmail.com> wrote:
>> 
>> В Ср, 25/01/2023 в 16:54 +0700, sskostyaev@gmail.com пишет:
>> 
>> > В Ср, 25/01/2023 в 02:35 +0000, Randy Taylor пишет:
>> > 
>> > > On Sunday, January 22nd, 2023 at 05:00,
>> > > sskostyaev@gmail.com sskostyaev@gmail.com wrote:
>> > > 
>> > > > There is also other issue - sometimes go-ts-mode syntax
>> > > > highliting
>> > > > breaks when I actively use it with `lsp-mode`- refactorings, auto
>> > > > formatting etc. But I can't reproduce it with`eglot`.
>> > > 
>> > > Seems like an `lsp-mode` problem then? I only use `eglot` and
>> > > haven't
>> > > noticed anything amiss.
>> > 
>> > I have reproduced this issue with eglot. But I can't share my working
>> > code screenshots and can't provide easy way to reproduce. Not sure
>> > how
>> > can I help to localize the problem then. This issue is not related to
>> > indentation.
>> 
>> 
>> Screenshot attached.
>> --
>> Best Regards,
>> Sergey Kostyaev
>
>Thanks. Can you please open a new bug for this? Please also see if you can reproduce it with emacs -Q. We can continue the discussion in the new bug.

[-- Attachment #2: Type: text/html, Size: 2116 bytes --]