Author: Felipe de Azevedo Piovezan Date: 2023-12-21T09:04:24-03:00 New Revision: cf0be7b4920cec762639a1f39e8ccf1868e44c40
URL: https://github.com/llvm/llvm-project/commit/cf0be7b4920cec762639a1f39e8ccf1868e44c40 DIFF: https://github.com/llvm/llvm-project/commit/cf0be7b4920cec762639a1f39e8ccf1868e44c40.diff LOG: [lldb] Add actionable feedback when overwriting a command fails (#76030) If adding a user commands fails because a command with the same name already exists, we only say that "force replace is not set" without telling the user _how_ to set it. There are two ways to do so; this commit changes the error message to mention both. Added: Modified: lldb/source/Interpreter/CommandInterpreter.cpp lldb/test/API/commands/command/script/TestCommandScript.py Removed: ################################################################################ diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index e1275ce711fc17..00651df48b6224 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -1160,7 +1160,11 @@ Status CommandInterpreter::AddUserCommand(llvm::StringRef name, if (UserCommandExists(name)) { if (!can_replace) { - result.SetErrorString("user command exists and force replace not set"); + result.SetErrorStringWithFormatv( + "user command \"{0}\" already exists and force replace was not set " + "by --overwrite or 'settings set interpreter.require-overwrite " + "false'", + name); return result; } if (cmd_sp->IsMultiwordObject()) { diff --git a/lldb/test/API/commands/command/script/TestCommandScript.py b/lldb/test/API/commands/command/script/TestCommandScript.py index cac11834fa7364..850552032902fd 100644 --- a/lldb/test/API/commands/command/script/TestCommandScript.py +++ b/lldb/test/API/commands/command/script/TestCommandScript.py @@ -161,6 +161,19 @@ def cleanup(): ) self.expect("my_command", substrs=["a.out"]) + # Test that without --overwrite we are not allowed to redefine the command. + self.expect( + "command script add my_command --class welcome.TargetnameCommand", + substrs=[ + ( + 'user command "my_command" already exists and force replace was' + " not set by --overwrite or 'settings set" + " interpreter.require-overwrite false'" + ), + ], + error=True, + ) + self.runCmd("command script clear") self.expect( _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
