Re: Bug#163190: zsh: Bad indentation in displayed shell function (whence -f)

Re: Bug#163190: zsh: Bad indentation in displayed shell function (whence -f)

[Clint Adams]

In the following example, the subshell commands are not indented
uniformly.

> $ blah() { ( echo; echo; echo ) }
> $ whence -f blah
> blah () {
>         ( echo
>                 echo
>                 echo )
> }

Here's one possible fix.  Thoughts?

Index: Src/text.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/text.c,v
retrieving revision 1.11
diff -u -r1.11 text.c
--- Src/text.c	7 Jun 2002 14:44:25 -0000	1.11
+++ Src/text.c	4 Oct 2002 21:43:16 -0000
@@ -345,14 +345,16 @@
 	    break;
 	case WC_SUBSH:
 	    if (!s) {
-		taddstr("( ");
+		taddstr("(");
 		tindent++;
+		taddnl();
 		n = tpush(code, 1);
 		n->u._subsh.end = state->pc + WC_SUBSH_SKIP(code);
 	    } else {
 		state->pc = s->u._subsh.end;
 		tindent--;
-		taddstr(" )");
+		taddnl();
+		taddstr(")");
 		stack = 1;
 	    }
 	    break;

Re: Bug#163190: zsh: Bad indentation in displayed shell function (whence -f)

[Oliver Kiddle]

On Fri, Oct 04, 2002 at 05:46:00PM -0400, Clint Adams wrote:
> In the following example, the subshell commands are not indented
> uniformly.
> 
> > $ blah() { ( echo; echo; echo ) }
> > $ whence -f blah
> > blah () {
> >         ( echo
> >                 echo
> >                 echo )
> > }
> 
> Here's one possible fix.  Thoughts?

That looks fine. You'd want to do the same for { ... } (WC_CURSH) too of
course.

The only thing better that I can think of would be to search ahead to see
if the sub shell contains anything more than one command. But that would
probably be more hassle than it's worth.

Oliver

This e-mail and any attachment is for authorised use by the intended recipient(s) only.  It may contain proprietary material, confidential information and/or be subject to legal privilege.  It should not be copied, disclosed to, retained or used by, any other party.  If you are not an intended recipient then please promptly delete this e-mail and any attachment and all copies and inform the sender.  Thank you.

Re: Bug#163190: zsh: Bad indentation in displayed shell function (whence -f)

[Clint Adams]

> That looks fine. You'd want to do the same for { ... } (WC_CURSH) too of
> course.

Okay, committing this one.

Index: Src/text.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/text.c,v
retrieving revision 1.11
diff -u -r1.11 text.c
--- Src/text.c	7 Jun 2002 14:44:25 -0000	1.11
+++ Src/text.c	13 Nov 2002 21:06:10 -0000
@@ -345,27 +345,31 @@
 	    break;
 	case WC_SUBSH:
 	    if (!s) {
-		taddstr("( ");
+		taddstr("(");
 		tindent++;
+		taddnl();
 		n = tpush(code, 1);
 		n->u._subsh.end = state->pc + WC_SUBSH_SKIP(code);
 	    } else {
 		state->pc = s->u._subsh.end;
 		tindent--;
-		taddstr(" )");
+		taddnl();
+		taddstr(")");
 		stack = 1;
 	    }
 	    break;
 	case WC_CURSH:
 	    if (!s) {
-		taddstr("{ ");
+		taddstr("{");
 		tindent++;
+		taddnl();
 		n = tpush(code, 1);
 		n->u._subsh.end = state->pc + WC_CURSH_SKIP(code);
 	    } else {
 		state->pc = s->u._subsh.end;
 		tindent--;
-		taddstr(" }");
+		taddnl();
+		taddstr("}");
 		stack = 1;
 	    }
 	    break;