- Notifications
You must be signed in to change notification settings - Fork14.5k
[lldb] Simplify handling of empty strings for MCP (NFC)#148317
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Merged
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Instead of storing a `std::optional<std::string>`, directly use a`std::string` and treat a missing value the same was as an empty string.
@llvm/pr-subscribers-lldb Author: Jonas Devlieghere (JDevlieghere) ChangesInstead of storing a Full diff:https://github.com/llvm/llvm-project/pull/148317.diff 4 Files Affected:
diff --git a/lldb/source/Plugins/Protocol/MCP/Protocol.cpp b/lldb/source/Plugins/Protocol/MCP/Protocol.cppindex e42e1bf1118cf..274ba6fac01ec 100644--- a/lldb/source/Plugins/Protocol/MCP/Protocol.cpp+++ b/lldb/source/Plugins/Protocol/MCP/Protocol.cpp@@ -42,7 +42,7 @@ bool fromJSON(const llvm::json::Value &V, Request &R, llvm::json::Path P) { llvm::json::Value toJSON(const ErrorInfo &EI) { llvm::json::Object Result{{"code", EI.code}, {"message", EI.message}};- if (EI.data)+ if (!EI.data.empty()) Result.insert({"data", EI.data}); return Result; }@@ -132,9 +132,9 @@ bool fromJSON(const llvm::json::Value &V, Resource &R, llvm::json::Path P) { llvm::json::Value toJSON(const Resource &R) { llvm::json::Object Result{{"uri", R.uri}, {"name", R.name}};- if (R.description)+ if (!R.description.empty()) Result.insert({"description", R.description});- if (R.mimeType)+ if (!R.mimeType.empty()) Result.insert({"mimeType", R.mimeType}); return Result; }@@ -146,7 +146,7 @@ bool fromJSON(const llvm::json::Value &V, Capabilities &C, llvm::json::Path P) { llvm::json::Value toJSON(const ResourceContents &RC) { llvm::json::Object Result{{"uri", RC.uri}, {"text", RC.text}};- if (RC.mimeType)+ if (!RC.mimeType.empty()) Result.insert({"mimeType", RC.mimeType}); return Result; }@@ -188,7 +188,7 @@ bool fromJSON(const llvm::json::Value &V, TextResult &TR, llvm::json::Path P) { llvm::json::Value toJSON(const ToolDefinition &TD) { llvm::json::Object Result{{"name", TD.name}};- if (TD.description)+ if (!TD.description.empty()) Result.insert({"description", TD.description}); if (TD.inputSchema) Result.insert({"inputSchema", TD.inputSchema});diff --git a/lldb/source/Plugins/Protocol/MCP/Protocol.h b/lldb/source/Plugins/Protocol/MCP/Protocol.hindex ffe621bee1c2a..ce74836e62541 100644--- a/lldb/source/Plugins/Protocol/MCP/Protocol.h+++ b/lldb/source/Plugins/Protocol/MCP/Protocol.h@@ -36,7 +36,7 @@ bool fromJSON(const llvm::json::Value &, Request &, llvm::json::Path); struct ErrorInfo { int64_t code = 0; std::string message;- std::optional<std::string> data;+ std::string data; }; llvm::json::Value toJSON(const ErrorInfo &);@@ -112,10 +112,10 @@ struct Resource { std::string name; /// A description of what this resource represents.- std::optional<std::string> description;+ std::string description; /// The MIME type of this resource, if known.- std::optional<std::string> mimeType;+ std::string mimeType; }; llvm::json::Value toJSON(const Resource &);@@ -131,7 +131,7 @@ struct ResourceContents { std::string text; /// The MIME type of this resource, if known.- std::optional<std::string> mimeType;+ std::string mimeType; }; llvm::json::Value toJSON(const ResourceContents &);@@ -167,7 +167,7 @@ struct ToolDefinition { std::string name; /// Human-readable description.- std::optional<std::string> description;+ std::string description; // JSON Schema for the tool's parameters. std::optional<llvm::json::Value> inputSchema;diff --git a/lldb/source/Plugins/Protocol/MCP/Tool.cpp b/lldb/source/Plugins/Protocol/MCP/Tool.cppindex eecd56141d2ed..bbc19a1e51942 100644--- a/lldb/source/Plugins/Protocol/MCP/Tool.cpp+++ b/lldb/source/Plugins/Protocol/MCP/Tool.cpp@@ -45,7 +45,7 @@ Tool::Tool(std::string name, std::string description) protocol::ToolDefinition Tool::GetDefinition() const { protocol::ToolDefinition definition; definition.name = m_name;- definition.description.emplace(m_description);+ definition.description = m_description; if (std::optional<llvm::json::Value> input_schema = GetSchema()) definition.inputSchema = *input_schema;diff --git a/lldb/unittests/Protocol/ProtocolMCPTest.cpp b/lldb/unittests/Protocol/ProtocolMCPTest.cppindex ddc5a411a5c31..ce8120cbfe9b9 100644--- a/lldb/unittests/Protocol/ProtocolMCPTest.cpp+++ b/lldb/unittests/Protocol/ProtocolMCPTest.cpp@@ -257,8 +257,8 @@ TEST(ProtocolMCPTest, ResourceWithoutOptionals) { EXPECT_EQ(resource.uri, deserialized_resource->uri); EXPECT_EQ(resource.name, deserialized_resource->name);- EXPECT_FALSE(deserialized_resource->description.has_value());- EXPECT_FALSE(deserialized_resource->mimeType.has_value());+ EXPECT_TRUE(deserialized_resource->description.empty());+ EXPECT_TRUE(deserialized_resource->mimeType.empty()); } TEST(ProtocolMCPTest, ResourceContents) {@@ -287,7 +287,7 @@ TEST(ProtocolMCPTest, ResourceContentsWithoutMimeType) { EXPECT_EQ(contents.uri, deserialized_contents->uri); EXPECT_EQ(contents.text, deserialized_contents->text);- EXPECT_FALSE(deserialized_contents->mimeType.has_value());+ EXPECT_TRUE(deserialized_contents->mimeType.empty()); } TEST(ProtocolMCPTest, ResourceResult) { |
ashgti approved these changesJul 12, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
⛵
6fea3da intollvm:main 11 checks passed
Uh oh!
There was an error while loading.Please reload this page.
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Instead of storing a
std::optional<std::string>, directly use astd::stringand treat a missing value the same was as an empty string.