From: Tom Tromey <tromey@adacore.com>
Date: Tue, 15 Dec 2020 15:07:32 +0000 (-0700)
Subject: Highlight deprecated commands using title style
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e5ad4426a0b186290b845852ba9dac112388cbc;p=binutils-gdb.git

Highlight deprecated commands using title style

After Andrew's latest patch, I noticed that the deprecation warnings
could use the (so-called) title style when printing command names.
This patch implements this idea.

gdb/ChangeLog
2020-12-15  Tom Tromey  <tromey@adacore.com>

	* cli/cli-decode.c (deprecated_cmd_warning): Use title style for
	command names.

gdb/testsuite/ChangeLog
2020-12-15  Tom Tromey  <tromey@adacore.com>

	* gdb.base/style.exp: Add deprecation tests.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0bf7d511f82..e82a7c4526d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-12-15  Tom Tromey  <tromey@adacore.com>
+
+	* cli/cli-decode.c (deprecated_cmd_warning): Use title style for
+	command names.
+
 2020-12-14  Tom Tromey  <tom@tromey.com>
 
 	* dtrace-probe.c (dtrace_process_dof_probe): Use value_type.
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 13260ac44e6..fb2856d4333 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -1939,16 +1939,23 @@ deprecated_cmd_warning (const char *text, struct cmd_list_element *list)
       tmp_alias_str += std::string (alias->name);
 
       if (cmd->cmd_deprecated)
-	printf_filtered (_("Warning: command '%s' (%s) is deprecated.\n"),
-			 tmp_cmd_str.c_str (), tmp_alias_str.c_str ());
+	printf_filtered (_("Warning: command '%ps' (%ps) is deprecated.\n"),
+			 styled_string (title_style.style (),
+					tmp_cmd_str.c_str ()),
+			 styled_string (title_style.style (),
+					tmp_alias_str.c_str ()));
       else
-	printf_filtered (_("Warning: '%s', an alias for the command '%s', "
+	printf_filtered (_("Warning: '%ps', an alias for the command '%ps', "
 			   "is deprecated.\n"),
-			 tmp_alias_str.c_str (), tmp_cmd_str.c_str ());
+			 styled_string (title_style.style (),
+					tmp_alias_str.c_str ()),
+			 styled_string (title_style.style (),
+					tmp_cmd_str.c_str ()));
     }
   else
-    printf_filtered (_("Warning: command '%s' is deprecated.\n"),
-		     tmp_cmd_str.c_str ());
+    printf_filtered (_("Warning: command '%ps' is deprecated.\n"),
+		     styled_string (title_style.style (),
+				    tmp_cmd_str.c_str ()));
 
   /* Now display a second line indicating what the user should use instead.
      If it is only the alias that is deprecated, we want to indicate the
@@ -1959,7 +1966,9 @@ deprecated_cmd_warning (const char *text, struct cmd_list_element *list)
   else
     replacement = cmd->replacement;
   if (replacement != nullptr)
-    printf_filtered (_("Use '%s'.\n\n"), replacement);
+    printf_filtered (_("Use '%ps'.\n\n"),
+		     styled_string (title_style.style (),
+				    replacement));
   else
     printf_filtered (_("No alternative known.\n\n"));
 
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a3a0941190f..0e6177b7dd4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-12-15  Tom Tromey  <tromey@adacore.com>
+
+	* gdb.base/style.exp: Add deprecation tests.
+
 2020-12-14  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* lib/gdb.exp (gdb_test_multiple): Fix typo in doc.
diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp
index 28c270591ba..8d7eaa80b63 100644
--- a/gdb/testsuite/gdb.base/style.exp
+++ b/gdb/testsuite/gdb.base/style.exp
@@ -172,4 +172,11 @@ save_vars { env(TERM) } {
 	"warning: [style .*? file] is not a directory\\..*"
     gdb_test "show data-directory" \
 	"GDB's data directory is \"[style .*? file]\"\\..*"
+
+    # Check that deprecation styles command names.
+    gdb_test_no_output "maintenance deprecate p \"new_p\"" \
+	"maintenance deprecate p \"new_p\" /1/"
+    gdb_test "p 5" \
+	"Warning: '[style p title]', an alias for the command '[style print title]', is deprecated.*Use '[style new_p title]'.*" \
+	"p deprecated warning, with replacement"
 }