Re: [PATCH 3/6] gdb: simplify completion_result::print_matches

[Lancelot SIX <lsix@lancelotsix.com>]

Hi Andlew,

I have a couple of minor comment below.

> diff --git a/gdb/completer.c b/gdb/completer.c
> index 9b4041da01a..2b3972213d8 100644
> --- a/gdb/completer.c
> +++ b/gdb/completer.c
> @@ -2311,23 +2311,30 @@ completion_tracker::build_completion_result (const char *text,
>  
>    if (m_lowest_common_denominator_unique)
>      {
> -      /* We don't rely on readline appending the quote char as
> -	 delimiter as then readline wouldn't append the ' ' after the
> -	 completion.  */
> -      char buf[2] = { (char) quote_char () };
> -
> -      match_list[0] = reconcat (match_list[0], match_list[0],
> -				buf, (char *) NULL);
> -      match_list[1] = NULL;
> -
> -      /* If the tracker wants to, or we already have a space at the
> -	 end of the match, tell readline to skip appending
> -	 another.  */
> -      char *match = match_list[0];
> -      bool completion_suppress_append
> -	= (suppress_append_ws ()
> -	   || (match[0] != '\0'
> -	       && match[strlen (match) - 1] == ' '));
> +      bool completion_suppress_append;
> +
> +      if (from_readline ())
> +	{
> +	  /* We don't rely on readline appending the quote char as
> +	     delimiter as then readline wouldn't append the ' ' after the
> +	     completion.  */
> +	  char buf[2] = { (char) quote_char () };

To be consistent with what is used below, "{ (char) quote_char (), '\0' }"

> +
> +	  match_list[0] = reconcat (match_list[0], match_list[0], buf,
> +				    (char *) nullptr);
> +
> +	  /* If the tracker wants to, or we already have a space at the end
> +	     of the match, tell readline to skip appending another.  */
> +	  char *match = match_list[0];
> +	  completion_suppress_append
> +	    = (suppress_append_ws ()
> +	       || (match[0] != '\0'
> +		   && match[strlen (match) - 1] == ' '));
> +	}
> +      else
> +	completion_suppress_append = false;
> +
> +      match_list[1] = nullptr;
>  
>        return completion_result (match_list, 1, completion_suppress_append);
>      }
> @@ -2449,21 +2456,14 @@ void
>  completion_result::print_matches (const std::string &prefix,
>  				  const char *word, int quote_char)
>  {
> -  if (this->number_matches == 1)
> -    printf_unfiltered ("%s%s\n", prefix.c_str (), this->match_list[0]);
> -  else
> -    {
> -      this->sort_match_list ();
> +  this->sort_match_list ();
>  
> -      for (size_t i = 0; i < this->number_matches; i++)
> -	{
> -	  printf_unfiltered ("%s%s", prefix.c_str (),
> -			     this->match_list[i + 1]);
> -	  if (quote_char)
> -	    printf_unfiltered ("%c", quote_char);
> -	  printf_unfiltered ("\n");
> -	}
> -    }
> +  char buf[2] = { (char) quote_char, '\0' };
> +  size_t off = this->number_matches == 1 ? 0 : 1;
> +
> +  for (size_t i = 0; i < this->number_matches; i++)
> +    printf_unfiltered ("%s%s%s\n", prefix.c_str (),
> +		       this->match_list[i + off], buf);
>  
>    if (this->number_matches == max_completions)
>      {
> diff --git a/gdb/testsuite/gdb.base/filename-completion.exp b/gdb/testsuite/gdb.base/filename-completion.exp
> index f23e8671f40..66e5f411795 100644
> --- a/gdb/testsuite/gdb.base/filename-completion.exp
> +++ b/gdb/testsuite/gdb.base/filename-completion.exp
> @@ -63,8 +63,21 @@ proc run_tests { root } {
>  	test_gdb_complete_none "file ${qc}${root}/xx" \
>  	    "expand a non-existent filename"
>  
> -	test_gdb_complete_unique "file ${qc}${root}/a" \
> -	    "file ${qc}${root}/aaa/" "" false \
> +	# The following test is split into separate cmd and tab calls as the
> +	# cmd versions will add a closing quote.  It shouldn't be doing
> +	# this; this will be fixed in a later commit.

Instead of testing the "wrong" behavior, if you intend to fix that in a
later patch, I’d be tempted to prefer to just use "setup_kfail".

> +	test_gdb_complete_cmd_unique "file ${qc}${root}/a" \
> +	    "file ${qc}${root}/aaa/${qc}" \
> +	    "expand a unique directory name"
> +
> +	if { [readline_is_used] } {
> +	    test_gdb_complete_tab_unique "file ${qc}${root}/a" \
> +		"file ${qc}${root}/aaa/" "" \
> +		"expand a unique directory name"
> +	}
> +
> +	test_gdb_complete_unique "file ${qc}${root}/cc2" \
> +	    "file ${qc}${root}/cc2${qc}" " " false \
>  	    "expand a unique filename"
>  
>  	test_gdb_complete_multiple "file ${qc}${root}/" \
> -- 
> 2.25.4
> 

Best,
Lancelot.