averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SourceKit] When Cursor infor resolves to the start of an expression, we always get the outermost expression. (#10738)

Browse Source 
The reason is that for clients, getting the offspring of an expression is
much easier that getting parents.
This commit is contained in:
Xi Ge
2017-06-30 17:57:36 -07:00
committed by GitHub
parent a184a6c955
commit e1a4bf32dd
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/swift/IDE/Utils.h
View File

@@ -188,6 +188,7 @@ class SemaLocResolver : public SourceEntityWalker {
SourceLoc LocToResolve;
SemaToken SemaTok;
Type ContainerType;
llvm::SmallVector<Expr*, 4> TrailingExprStack;
public:
explicit SemaLocResolver(SourceFile &SrcFile) : SrcFile(SrcFile) { }
@@ -216,7 +217,6 @@ private:
SourceLoc Loc, bool IsRef, Type Ty = Type());
bool tryResolve(ModuleEntity Mod, SourceLoc Loc);
bool tryResolve(Stmt *St);
bool tryResolve(Expr *Exp);
bool visitSubscriptReference(ValueDecl *D, CharSourceRange Range,
bool IsOpenBracket) override;
};

19
lib/IDE/SwiftSourceDocInfo.cpp
View File

@@ -108,14 +108,6 @@ bool SemaLocResolver::tryResolve(Stmt *St) {
return false;
}
bool SemaLocResolver::tryResolve(Expr *Exp) {
if (!Exp->isImplicit() && Exp->getStartLoc() == LocToResolve) {
SemaTok = { Exp };
return true;
}
return false;
}
bool SemaLocResolver::visitSubscriptReference(ValueDecl *D, CharSourceRange Range,
bool IsOpenBracket) {
// We should treat both open and close brackets equally
@@ -193,6 +185,10 @@ bool SemaLocResolver::walkToExprPre(Expr *E) {
ContainerType = ME->getBase()->getType();
}
}
// Keep track of trailing expressions.
if (!E->isImplicit() && E->getStartLoc() == LocToResolve)
TrailingExprStack.push_back(E);
}
return true;
}
@@ -200,7 +196,12 @@ bool SemaLocResolver::walkToExprPre(Expr *E) {
bool SemaLocResolver::walkToExprPost(Expr *E) {
if (isDone())
return false;
return !tryResolve(E);
if (!TrailingExprStack.empty() && TrailingExprStack.back() == E) {
// We return the outtermost expression in the token info.
SemaTok = { TrailingExprStack.front() };
return false;
}
return true;
}
bool SemaLocResolver::visitCallArgName(Identifier Name, CharSourceRange Range,