[clang-tools-extra] 0496cf2 - [clangd] Use empty string to represent None semantics in FoldingRange::kind

[Kadir Cetinkaya via cfe-commits]

Author: Kadir Cetinkaya
Date: 2022-07-18T15:01:48+02:00
New Revision: 0496cf2f6a2ef640ad6577b083068be59c3ea137

URL: https://github.com/llvm/llvm-project/commit/0496cf2f6a2ef640ad6577b083068be59c3ea137
DIFF: https://github.com/llvm/llvm-project/commit/0496cf2f6a2ef640ad6577b083068be59c3ea137.diff

LOG: [clangd] Use empty string to represent None semantics in FoldingRange::kind

Differential Revision: https://reviews.llvm.org/D130003

Added: 
    

Modified: 
    clang-tools-extra/clangd/Protocol.cpp
    clang-tools-extra/clangd/Protocol.h

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/Protocol.cpp b/clang-tools-extra/clangd/Protocol.cpp
index 01127fa9ae9e..ab75faaf9858 100644
--- a/clang-tools-extra/clangd/Protocol.cpp
+++ b/clang-tools-extra/clangd/Protocol.cpp
@@ -1444,8 +1444,8 @@ llvm::json::Value toJSON(const FoldingRange &Range) {
     Result["startCharacter"] = Range.startCharacter;
   if (Range.endCharacter)
     Result["endCharacter"] = Range.endCharacter;
-  if (Range.kind)
-    Result["kind"] = *Range.kind;
+  if (!Range.kind.empty())
+    Result["kind"] = Range.kind;
   return Result;
 }
 

diff  --git a/clang-tools-extra/clangd/Protocol.h b/clang-tools-extra/clangd/Protocol.h
index fd3b671d15f3..0087017efad4 100644
--- a/clang-tools-extra/clangd/Protocol.h
+++ b/clang-tools-extra/clangd/Protocol.h
@@ -1772,7 +1772,7 @@ struct FoldingRange {
   unsigned startCharacter;
   unsigned endLine = 0;
   unsigned endCharacter;
-  llvm::Optional<std::string> kind;
+  std::string kind;
 };
 llvm::json::Value toJSON(const FoldingRange &Range);