diff --git a/clang-tools-extra/clangd/Hover.cpp b/clang-tools-extra/clangd/Hover.cpp --- a/clang-tools-extra/clangd/Hover.cpp +++ b/clang-tools-extra/clangd/Hover.cpp @@ -777,6 +777,80 @@ return HI; } +llvm::Optional +getStringLiteralHoverContents(const StringLiteral *SL, + const LangOptions &LangOpts) { + HoverInfo HI; + + HI.Name = "String Literal"; + + // In C++ string literals have `const` qualifier, but in C they don't. + std::string Qualifier; + + std::string CharType; + // C++ + if (LangOpts.CPlusPlus) { + Qualifier = "const"; + if (LangOpts.CPlusPlus20 || LangOpts.CPlusPlus2b) { + switch (SL->getKind()) { + case StringLiteral::Ordinary: + CharType = "char"; + break; + case StringLiteral::Wide: + CharType = "wchar_t"; + break; + case StringLiteral::UTF8: + CharType = "char8_t"; + break; + case StringLiteral::UTF16: + CharType = "char16_t"; + break; + case StringLiteral::UTF32: + CharType = "char32_t"; + break; + } + } else if (LangOpts.CPlusPlus11 || LangOpts.CPlusPlus14 || + LangOpts.CPlusPlus17) { + switch (SL->getKind()) { + case StringLiteral::Ordinary: + case StringLiteral::UTF8: + CharType = "char"; + break; + case StringLiteral::Wide: + CharType = "wchar_t"; + break; + case StringLiteral::UTF16: + CharType = "char16_t"; + break; + case StringLiteral::UTF32: + CharType = "char32_t"; + break; + } + } else { + switch (SL->getKind()) { + case StringLiteral::Ordinary: + CharType = "char"; + break; + case StringLiteral::Wide: + CharType = "wchar_t"; + break; + default: + llvm_unreachable("Unsupported until C++11"); + } + } + } else { + // TODO: For other languages + return llvm::None; + } + + HoverInfo::PrintedType Type; + Type.Type = + llvm::formatv("{0} {1}[{2}]", Qualifier, CharType, SL->getLength() + 1); + HI.Type = Type; + + return HI; +} + bool isLiteral(const Expr *E) { // Unfortunately there's no common base Literal classes inherits from // (apart from Expr), therefore these exclusions. @@ -806,8 +880,14 @@ const SymbolIndex *Index) { // There's not much value in hovering over "42" and getting a hover card // saying "42 is an int", similar for other literals. - if (isLiteral(E)) + if (isLiteral(E)) { + // Generate hover info for string literals showing + // its character's type and length + if (const StringLiteral *SL = dyn_cast(E)) { + return getStringLiteralHoverContents(SL, AST.getLangOpts()); + } return llvm::None; + } HoverInfo HI; // For `this` expr we currently generate hover with pointee type. diff --git a/clang-tools-extra/clangd/unittests/HoverTests.cpp b/clang-tools-extra/clangd/unittests/HoverTests.cpp --- a/clang-tools-extra/clangd/unittests/HoverTests.cpp +++ b/clang-tools-extra/clangd/unittests/HoverTests.cpp @@ -1300,7 +1300,6 @@ "auto x = ^42.0i;", "auto x = ^42;", "auto x = ^nullptr;", - "auto x = ^\"asdf\";", }; for (const auto &Test : Tests) { @@ -1326,6 +1325,11 @@ HI.Type = "char"; HI.Value = "65 (0x41)"; }}, + {"auto s = ^[[\"Hello, world!\"]]; // string literal", + [](HoverInfo &HI) { + HI.Name = "String Literal"; + HI.Type = "const char[14]"; + }}, { R"cpp(// Local variable int main() {