bug#33989: 27.0.50; master: Tcl indentation broken

bug#33989: 27.0.50; master: Tcl indentation broken

[Benjamin Riefenstahl]

Commit cd5bb4bf3d "Fix two tcl-mode defun-related bugs" breaks
indentation of Tcl code for me outside of procs.  Consider:

fooBaz {
    |
}

Where the | indicates the expected indentation.  But on current master
pressing TAB instead goes to the beginning of the line.  Given that it
is common in Tcl to have code on the global level of a script, this is
not what I expect and want.

Reproduced with current master and "emacs -Q".

bug#33989: 27.0.50; master: Tcl indentation broken

[Eli Zaretskii]

> From: Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
> Date: Sat, 05 Jan 2019 18:19:11 +0100
> 
> Commit cd5bb4bf3d "Fix two tcl-mode defun-related bugs" breaks
> indentation of Tcl code for me outside of procs.  Consider:
> 
> fooBaz {
>     |
> }
> 
> Where the | indicates the expected indentation.  But on current master
> pressing TAB instead goes to the beginning of the line.  Given that it
> is common in Tcl to have code on the global level of a script, this is
> not what I expect and want.
> 
> Reproduced with current master and "emacs -Q".

Thanks, I'm CC'ing Tom who made those changes.

bug#33989: 27.0.50; master: Tcl indentation broken

[Eli Zaretskii]

> Date: Sat, 05 Jan 2019 20:10:40 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 33989@debbugs.gnu.org

Ping!  Tom, could you please look at this issue?

> > From: Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
> > Date: Sat, 05 Jan 2019 18:19:11 +0100
> > 
> > Commit cd5bb4bf3d "Fix two tcl-mode defun-related bugs" breaks
> > indentation of Tcl code for me outside of procs.  Consider:
> > 
> > fooBaz {
> >     |
> > }
> > 
> > Where the | indicates the expected indentation.  But on current master
> > pressing TAB instead goes to the beginning of the line.  Given that it
> > is common in Tcl to have code on the global level of a script, this is
> > not what I expect and want.
> > 
> > Reproduced with current master and "emacs -Q".
> 
> Thanks, I'm CC'ing Tom who made those changes.

bug#33989: 27.0.50; master: Tcl indentation broken

[Eli Zaretskii]

Ping! Ping!  Thom, could you please look at this?

> Date: Sat, 12 Jan 2019 13:43:57 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 33989@debbugs.gnu.org, b.riefenstahl@turtle-trading.net
> 
> > Date: Sat, 05 Jan 2019 20:10:40 +0200
> > From: Eli Zaretskii <eliz@gnu.org>
> > Cc: 33989@debbugs.gnu.org
> 
> Ping!  Tom, could you please look at this issue?
> 
> > > From: Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
> > > Date: Sat, 05 Jan 2019 18:19:11 +0100
> > > 
> > > Commit cd5bb4bf3d "Fix two tcl-mode defun-related bugs" breaks
> > > indentation of Tcl code for me outside of procs.  Consider:
> > > 
> > > fooBaz {
> > >     |
> > > }
> > > 
> > > Where the | indicates the expected indentation.  But on current master
> > > pressing TAB instead goes to the beginning of the line.  Given that it
> > > is common in Tcl to have code on the global level of a script, this is
> > > not what I expect and want.
> > > 
> > > Reproduced with current master and "emacs -Q".
> > 
> > Thanks, I'm CC'ing Tom who made those changes.

bug#33989: 27.0.50; master: Tcl indentation broken

[Eli Zaretskii]

Ping! Ping! Ping!  Tom, please look into this problem.

> Date: Sat, 19 Jan 2019 09:34:17 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 33989@debbugs.gnu.org, b.riefenstahl@turtle-trading.net
> 
> Ping! Ping!  Thom, could you please look at this?
> 
> > Date: Sat, 12 Jan 2019 13:43:57 +0200
> > From: Eli Zaretskii <eliz@gnu.org>
> > Cc: 33989@debbugs.gnu.org, b.riefenstahl@turtle-trading.net
> > 
> > > Date: Sat, 05 Jan 2019 20:10:40 +0200
> > > From: Eli Zaretskii <eliz@gnu.org>
> > > Cc: 33989@debbugs.gnu.org
> > 
> > Ping!  Tom, could you please look at this issue?
> > 
> > > > From: Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
> > > > Date: Sat, 05 Jan 2019 18:19:11 +0100
> > > > 
> > > > Commit cd5bb4bf3d "Fix two tcl-mode defun-related bugs" breaks
> > > > indentation of Tcl code for me outside of procs.  Consider:
> > > > 
> > > > fooBaz {
> > > >     |
> > > > }
> > > > 
> > > > Where the | indicates the expected indentation.  But on current master
> > > > pressing TAB instead goes to the beginning of the line.  Given that it
> > > > is common in Tcl to have code on the global level of a script, this is
> > > > not what I expect and want.
> > > > 
> > > > Reproduced with current master and "emacs -Q".
> > > 
> > > Thanks, I'm CC'ing Tom who made those changes.
> 
> 
> 
> 

bug#33989: 27.0.50; master: Tcl indentation broken

[Eli Zaretskii]

Ping! Ping! Ping! Ping!  Tom, could you please look at this issue?

> Date: Fri, 25 Jan 2019 10:10:09 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 33989@debbugs.gnu.org, b.riefenstahl@turtle-trading.net
> 
> Ping! Ping! Ping!  Tom, please look into this problem.
> 
> > Date: Sat, 19 Jan 2019 09:34:17 +0200
> > From: Eli Zaretskii <eliz@gnu.org>
> > Cc: 33989@debbugs.gnu.org, b.riefenstahl@turtle-trading.net
> > 
> > Ping! Ping!  Thom, could you please look at this?
> > 
> > > Date: Sat, 12 Jan 2019 13:43:57 +0200
> > > From: Eli Zaretskii <eliz@gnu.org>
> > > Cc: 33989@debbugs.gnu.org, b.riefenstahl@turtle-trading.net
> > > 
> > > > Date: Sat, 05 Jan 2019 20:10:40 +0200
> > > > From: Eli Zaretskii <eliz@gnu.org>
> > > > Cc: 33989@debbugs.gnu.org
> > > 
> > > Ping!  Tom, could you please look at this issue?
> > > 
> > > > > From: Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
> > > > > Date: Sat, 05 Jan 2019 18:19:11 +0100
> > > > > 
> > > > > Commit cd5bb4bf3d "Fix two tcl-mode defun-related bugs" breaks
> > > > > indentation of Tcl code for me outside of procs.  Consider:
> > > > > 
> > > > > fooBaz {
> > > > >     |
> > > > > }
> > > > > 
> > > > > Where the | indicates the expected indentation.  But on current master
> > > > > pressing TAB instead goes to the beginning of the line.  Given that it
> > > > > is common in Tcl to have code on the global level of a script, this is
> > > > > not what I expect and want.
> > > > > 
> > > > > Reproduced with current master and "emacs -Q".
> > > > 
> > > > Thanks, I'm CC'ing Tom who made those changes.

bug#33989: 27.0.50; master: Tcl indentation broken

[Benjamin Riefenstahl]

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

Attaching a patch with a simple test-case.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-tcl-mode-Add-a-test-for-top-level-indentation.patch --]
[-- Type: text/x-diff, Size: 1029 bytes --]

From 65e830aa45fc61536c3aec4af70cb0a58538519a Mon Sep 17 00:00:00 2001
From: Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
Date: Sat, 12 Jan 2019 15:42:35 +0100
Subject: [PATCH] tcl-mode: Add a test for top level indentation

* test/lisp/progmodes/tcl-tests.el (tcl-mode-global-indent): Add.
---
 test/lisp/progmodes/tcl-tests.el | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/lisp/progmodes/tcl-tests.el b/test/lisp/progmodes/tcl-tests.el
index 50c3eba75d..b145244a63 100644
--- a/test/lisp/progmodes/tcl-tests.el
+++ b/test/lisp/progmodes/tcl-tests.el
@@ -72,6 +72,15 @@
       (indent-region (point-min) (point-max))
       (should (equal (buffer-string) text)))))
 
+;; Reproduce bug#33989
+(ert-deftest tcl-mode-global-indent ()
+  (with-temp-buffer
+    (tcl-mode)
+    (let ((text "fooBar {\n    inside\n}\n"))
+      (insert text)
+      (indent-region (point-min) (point-max))
+      (should (equal (buffer-string) text)))))
+
 (provide 'tcl-tests)
 
 ;;; tcl-tests.el ends here
-- 
2.11.0

bug#33989: 27.0.50; master: Tcl indentation broken

[Lars Ingebrigtsen]

Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net> writes:

> Commit cd5bb4bf3d "Fix two tcl-mode defun-related bugs" breaks
> indentation of Tcl code for me outside of procs.  Consider:
>
> fooBaz {
>     |
> }

This was apparently fixed by:

commit 518ff50f7a245f437576c5f7e716be9cba336287
Author:     Rolf Ade <rolf@pointsman.de>
AuthorDate: Sun Oct 13 05:18:36 2019 +0200
Commit:     Lars Ingebrigtsen <larsi@gnus.org>
CommitDate: Sun Oct 13 05:18:36 2019 +0200

    TCL indentation fix outside functions
    
    * lisp/progmodes/tcl.el (tcl-calculate-indent): Indent code
    correctly outside of function definitions (bug#23565).

I'm unable to reproduce the bug in the included test case, at least, so
I'm closing this bug report.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#33989: 27.0.50; master: Tcl indentation broken

[Benjamin Riefenstahl]

Lars Ingebrigtsen writes:
> This was apparently fixed by:

Thanks, looks good.

benny