Re: [PATCH v2 2/3] kconfig: wrap long expressions in menuconfig

[Julian Braha <julianbraha@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 3688 bytes --]

On 11/11/26 17:35, sashiko-bot@kernel.org wrote:
> Thank you for your contribution! Sashiko AI review found 1 potential
> issue to consider:
> - [Low] kconfig: broken '(' and operator wrapping in
>   expr_print_gstr_helper()
> --
> 
> commit 89202a55a9cf081fc680fbfa051ebe8d0cfa7113
> Author: Julian Braha <julianbraha@gmail.com>
> 
> kconfig: wrap long expressions in menuconfig
> 
> This commit wraps long Kconfig expressions across lines with matching
> indentation in menuconfig search and help text, keeping '!' prefixes and
> value annotations attached to their symbols.
> 
>> diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
>> index 2b91d16bf14fb..9284ccb20259c 100644
>> --- a/scripts/kconfig/expr.c
>> +++ b/scripts/kconfig/expr.c
>> @@ -1155,30 +1155,40 @@ static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *s
>>  	if (sym)
>>  		sym_str = sym_get_string_value(sym);
>>  
>> -	if (gs->max_width) {
>> +	if (gs->max_width && !strchr(str, '\n')) {
>>  		unsigned extra_length = strlen(str);
>>  		const char *last_cr = strrchr(gs->s, '\n');
>>  		unsigned last_line_length;
>> +		unsigned int prefix_len = strlen(gs->s) - gs->wrap_pos;
>>  
>> -		if (sym_str)
>> +		/* Ensure the value annotation stays attached to the symbol on wrap */
>> +		if (sym_str && sym->type != S_UNKNOWN)
>>  			extra_length += 4 + strlen(sym_str);
>>  
>> -		if (!last_cr)
>> -			last_cr = gs->s;
>> +		last_line_length = strlen(last_cr ? last_cr + 1 : gs->s);
>>  
>> -		last_line_length = strlen(gs->s) - (last_cr - gs->s);
>> -
>> -		if ((last_line_length + extra_length) > gs->max_width)
>> -			str_append(gs, "\\\n");
>> +		if (last_line_length > gs->indent + prefix_len &&
>> +		    last_line_length + extra_length > gs->max_width) {
>> +			gs->s[gs->wrap_pos] = '\0';
>> +			str_printf(gs, "\n%*s", gs->indent, "");
>> +			while (prefix_len--)
>> +				str_append(gs, "!");
>> +			if (!sym)
>> +				str += strspn(str, " ");
>> +		}
>>  	}
>>  
>>  	str_append(gs, str);
>>  	if (sym && sym->type != S_UNKNOWN)
>>  		str_printf(gs, " [=%s]", sym_str);
>> +	/* Ensure '!' stays attached to the symbol on wrap */
>> +	if (sym || strcmp(str, "!"))
>> +		gs->wrap_pos = strlen(gs->s);
>>  }
> [Severity: Low]
> Does expr_print_gstr_helper() mishandle wrapping around "(" and wrapped
> operators?
> 
> When expr_print() formats a negated parenthesized expression such as
> "!(A || B)", it emits "!" and then "(" before the first symbol.  Because
> strcmp("(", "!") is non-zero, printing "(" updates gs->wrap_pos to point
> after "!(" and resets prefix_len to 0.  If the first symbol plus its
> "[=...]" annotation then exceeds gs->max_width, it wraps after "(",
> leaving "!(" (or "(") dangling at the end of the previous line.
> 
> In addition, the guard "last_line_length > gs->indent + prefix_len"
> assumes only indentation and "!" can precede the first symbol on a line.
> After " && " or " || " wraps onto a new line (or after "(" or "[" is
> printed at the start of a line), gs->wrap_pos is updated past that token,
> making last_line_length greater than gs->indent + prefix_len before any
> symbol is printed on the line.  If the following symbol and its value
> annotation exceed gs->max_width, expr_print_gstr_helper() wraps a second
> time and leaves "&& ", "|| ", "(" or "[" stranded on a line by itself.
> 
> -- Sashiko AI review · https://sashiko.dev/#/
> patchset/20261110173526.1548434-1-julianbraha@gmail.com?part=2
> 

Sashiko is hallucinating this time.

I mean, what it's saying is correct, but this is intended behavior not a
bug.

- Julian Braha

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]