@@ -776,6 +776,7 @@ struct DeclInfo {
776776 Type ContainerType;
777777 bool IsRef;
778778 bool IsDynamic;
779+ Expr* LitExpr;
779780 ArrayRef<NominalTypeDecl *> ReceiverTypes;
780781
781782 // / If VD is a synthesized property wrapper backing storage (_foo) or
@@ -788,10 +789,10 @@ struct DeclInfo {
788789 bool InSynthesizedExtension = false ;
789790
790791 DeclInfo (const ValueDecl *VD, Type ContainerType, bool IsRef, bool IsDynamic,
791- ArrayRef<NominalTypeDecl *> ReceiverTypes,
792+ Expr *LitExpr, ArrayRef<NominalTypeDecl *> ReceiverTypes,
792793 const CompilerInvocation &Invoc)
793794 : VD(VD), ContainerType(ContainerType), IsRef(IsRef),
794- IsDynamic (IsDynamic), ReceiverTypes(ReceiverTypes) {
795+ IsDynamic (IsDynamic), LitExpr(LitExpr), ReceiverTypes(ReceiverTypes) {
795796 if (VD == nullptr )
796797 return ;
797798
@@ -944,12 +945,17 @@ fillSymbolInfo(CursorSymbolInfo &Symbol, const DeclInfo &DInfo,
944945 SmallString<256 > Buffer;
945946 SmallVector<StringRef, 4 > Strings;
946947 llvm::raw_svector_ostream OS (Buffer);
948+ bool isLiteral = DInfo.LitExpr != nullptr ;
947949
948950 Symbol.DeclarationLang = SwiftLangSupport::getUIDForDeclLanguage (DInfo.VD );
949- Symbol.Kind = SwiftLangSupport::getUIDForDecl (DInfo.VD , DInfo.IsRef );
950951
951- SwiftLangSupport::printDisplayName (DInfo.VD , OS);
952- Symbol.Name = copyAndClearString (Allocator, Buffer);
952+ if (isLiteral) {
953+ Symbol.Kind = SwiftLangSupport::getUIDForLiteral (DInfo.LitExpr );
954+ } else {
955+ Symbol.Kind = SwiftLangSupport::getUIDForDecl (DInfo.VD , DInfo.IsRef );
956+ SwiftLangSupport::printDisplayName (DInfo.VD , OS);
957+ Symbol.Name = copyAndClearString (Allocator, Buffer);
958+ }
953959
954960 SwiftLangSupport::printUSR (DInfo.OriginalProperty , OS);
955961 if (DInfo.InSynthesizedExtension ) {
@@ -958,10 +964,17 @@ fillSymbolInfo(CursorSymbolInfo &Symbol, const DeclInfo &DInfo,
958964 }
959965 Symbol.USR = copyAndClearString (Allocator, Buffer);
960966
967+ Type InterfaceType;
968+ if (isLiteral) {
969+ InterfaceType = DInfo.LitExpr ->getType ();
970+ } else {
971+ InterfaceType = DInfo.VD ->getInterfaceType ();
972+ }
973+
961974 {
962975 PrintOptions Options;
963976 Options.PrintTypeAliasUnderlyingType = true ;
964- DInfo. VD -> getInterfaceType () .print (OS, Options);
977+ InterfaceType .print (OS, Options);
965978 }
966979 Symbol.TypeName = copyAndClearString (Allocator, Buffer);
967980
@@ -970,7 +983,7 @@ fillSymbolInfo(CursorSymbolInfo &Symbol, const DeclInfo &DInfo,
970983 // But ParameterizedProtocolType can currently occur in 'typealias'
971984 // declarations. rdar://99176683
972985 // To avoid crashing in USR generation, return an error for now.
973- if (auto Ty = DInfo. VD -> getInterfaceType () ) {
986+ if (Type Ty = InterfaceType ) {
974987 while (auto MetaTy = Ty->getAs <MetatypeType>()) {
975988 Ty = MetaTy->getInstanceType ();
976989 }
@@ -981,7 +994,11 @@ fillSymbolInfo(CursorSymbolInfo &Symbol, const DeclInfo &DInfo,
981994 }
982995 }
983996
984- SwiftLangSupport::printDeclTypeUSR (DInfo.VD , OS);
997+ if (isLiteral) {
998+ SwiftLangSupport::printTypeUSR (DInfo.LitExpr ->getType (), OS);
999+ } else {
1000+ SwiftLangSupport::printDeclTypeUSR (DInfo.VD , OS);
1001+ }
9851002 Symbol.TypeUSR = copyAndClearString (Allocator, Buffer);
9861003
9871004 if (DInfo.ContainerType && !DInfo.ContainerType ->hasArchetype ()) {
@@ -1151,15 +1168,40 @@ fillSymbolInfo(CursorSymbolInfo &Symbol, const DeclInfo &DInfo,
11511168 return llvm::Error::success ();
11521169}
11531170
1171+ static bool
1172+ addCursorInfoForLiteral (CursorInfoData &Data, Expr *LitExpr,
1173+ SwiftLangSupport &Lang,
1174+ const CompilerInvocation &CompInvoc,
1175+ SourceLoc CursorLoc,
1176+ ArrayRef<ImmutableTextSnapshotRef> PreviousSnaps) {
1177+ Type LitType = LitExpr->getType ();
1178+ if (!LitType || !LitType->getAnyNominal ()) {
1179+ return false ;
1180+ }
1181+ TypeDecl *Decl = LitType->getAnyNominal ();
1182+ auto &Symbol = Data.Symbols .emplace_back ();
1183+ DeclInfo Info (Decl, nullptr , false , false , LitExpr, {}, CompInvoc);
1184+ auto Err = fillSymbolInfo (Symbol, Info, CursorLoc, false , Lang, CompInvoc,
1185+ PreviousSnaps, Data.Allocator );
1186+ bool Success = true ;
1187+ llvm::handleAllErrors (
1188+ std::move (Err), [&](const llvm::StringError &E) {
1189+ Data.InternalDiagnostic =
1190+ copyCString (E.getMessage (), Data.Allocator );
1191+ Success = false ;
1192+ });
1193+ return Success;
1194+ }
1195+
11541196static bool
11551197addCursorInfoForDecl (CursorInfoData &Data, ResolvedValueRefCursorInfoPtr Info,
11561198 bool AddRefactorings, bool AddSymbolGraph,
11571199 SwiftLangSupport &Lang, const CompilerInvocation &Invoc,
11581200 std::string &Diagnostic,
11591201 ArrayRef<ImmutableTextSnapshotRef> PreviousSnaps) {
11601202 DeclInfo OrigInfo (Info->getValueD (), Info->getContainerType (), Info->isRef (),
1161- Info->isDynamic (), Info->getReceiverTypes (), Invoc);
1162- DeclInfo CtorTypeInfo (Info->getCtorTyRef (), Type (), true , false ,
1203+ Info->isDynamic (), nullptr , Info->getReceiverTypes (), Invoc);
1204+ DeclInfo CtorTypeInfo (Info->getCtorTyRef (), Type (), true , false , nullptr ,
11631205 ArrayRef<NominalTypeDecl *>(), Invoc);
11641206 DeclInfo &MainInfo = CtorTypeInfo.VD ? CtorTypeInfo : OrigInfo;
11651207 if (MainInfo.Unavailable ) {
@@ -1196,7 +1238,7 @@ addCursorInfoForDecl(CursorInfoData &Data, ResolvedValueRefCursorInfoPtr Info,
11961238 if (!Info->isRef ()) {
11971239 for (auto D : Info->getShorthandShadowedDecls ()) {
11981240 CursorSymbolInfo &SymbolInfo = Data.Symbols .emplace_back ();
1199- DeclInfo DInfo (D, Type (), /* IsRef=*/ true , /* IsDynamic=*/ false ,
1241+ DeclInfo DInfo (D, Type (), /* IsRef=*/ true , /* IsDynamic=*/ false , nullptr ,
12001242 ArrayRef<NominalTypeDecl *>(), Invoc);
12011243 if (auto Err =
12021244 fillSymbolInfo (SymbolInfo, DInfo, Info->getLoc (), AddSymbolGraph,
@@ -1630,21 +1672,54 @@ static void resolveCursor(
16301672 }
16311673 case CursorInfoKind::ExprStart:
16321674 case CursorInfoKind::StmtStart: {
1675+ // If code under cursor is literal expression returns Expr,
1676+ // otherwise nullptr
1677+ auto tryGetLiteralExpr = [](auto CI) -> Expr * {
1678+ auto *ExprInfo = dyn_cast<ResolvedExprStartCursorInfo>(CI);
1679+ if (!ExprInfo || !ExprInfo->getTrailingExpr ()) {
1680+ return nullptr ;
1681+ }
1682+ Expr* E = ExprInfo->getTrailingExpr ();
1683+ if (dyn_cast<LiteralExpr>(E)) {
1684+ return E;
1685+ }
1686+ switch (E->getKind ()) {
1687+ case ExprKind::Array:
1688+ case ExprKind::Dictionary:
1689+ case ExprKind::KeyPath: {
1690+ return E;
1691+ }
1692+ default :
1693+ return nullptr ;
1694+ }
1695+ };
1696+
1697+ CursorInfoData Data;
1698+
16331699 if (Actionables) {
16341700 addRefactorings (
16351701 Actions, collectRefactorings (CursorInfo, /* ExcludeRename=*/ true ));
1636- if (!Actions.empty ()) {
1637- CursorInfoData Data;
1638- Data.AvailableActions = Actions;
1639- Receiver (RequestResult<CursorInfoData>::fromResult (Data));
1640- return ;
1702+ Data.AvailableActions = Actions;
1703+ }
1704+
1705+ // Handle literal expression
1706+ if (auto *LitExpr = tryGetLiteralExpr (CursorInfo)) {
1707+ bool Success = addCursorInfoForLiteral (Data, LitExpr, Lang, CompInvok,
1708+ CursorInfo->getLoc (),
1709+ getPreviousASTSnaps ());
1710+ if (!Success) {
1711+ Data.Symbols .clear ();
1712+ Data.AvailableActions .clear ();
16411713 }
16421714 }
16431715
1644- CursorInfoData Info;
1645- Info.InternalDiagnostic =
1646- " Resolved to incomplete expression or statement."
1647- Receiver (RequestResult<CursorInfoData>::fromResult (Info));
1716+ if (Data.InternalDiagnostic .empty () && Data.AvailableActions .empty () &&
1717+ Data.Symbols .empty ()) {
1718+ Data.InternalDiagnostic =
1719+ " Resolved to incomplete expression or statement."
1720+ }
1721+
1722+ Receiver (RequestResult<CursorInfoData>::fromResult (Data));
16481723 return ;
16491724 }
16501725 case CursorInfoKind::Invalid:
0 commit comments