This is an archive of the discontinued LLVM Phabricator instance.

Differential D34106

[clangd] Use 'std::string' for VFSTag instead of 'int'
ClosedPublic

Authored by ilya-biryukov on Jun 12 2017, 9:07 AM.

Details

Reviewers
krasimir
Commits
rGe36035b1210b: [clangd] Use 'std::string' for VFSTag instead of 'int'
rCTE305279: [clangd] Use 'std::string' for VFSTag instead of 'int'
rL305279: [clangd] Use 'std::string' for VFSTag instead of 'int'

Diff Detail

Event Timeline

ilya-biryukov created this revision.Jun 12 2017, 9:07 AM
ilya-biryukov added a project: Restricted Project.Jun 12 2017, 9:08 AM
krasimir accepted this revision.Jun 12 2017, 12:42 PM
This revision is now accepted and ready to land.Jun 12 2017, 12:42 PM
Closed by commit rL305279: [clangd] Use 'std::string' for VFSTag instead of 'int' (authored by ibiryukov). · Explain WhyJun 13 2017, 1:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clangd/
8 lines
unittests/
clangd/
4 lines

Diff 102189

clangd/ClangdServer.h

Show All 37 Lines
/// Turn a [line, column] pair into an offset in Code. /// Turn a [line, column] pair into an offset in Code.
size_t positionToOffset(StringRef Code, Position P); size_t positionToOffset(StringRef Code, Position P);
/// Turn an offset in Code into a [line, column] pair. /// Turn an offset in Code into a [line, column] pair.
Position offsetToPosition(StringRef Code, size_t Offset); Position offsetToPosition(StringRef Code, size_t Offset);
/// A tag supplied by the FileSytemProvider. /// A tag supplied by the FileSytemProvider.
typedef int VFSTag; typedef std::string VFSTag;
/// A value of an arbitrary type and VFSTag that was supplied by the /// A value of an arbitrary type and VFSTag that was supplied by the
/// FileSystemProvider when this value was computed. /// FileSystemProvider when this value was computed.
template <class T> class Tagged { template <class T> class Tagged {
public: public:
template <class U> template <class U>
Tagged(U &&Value, VFSTag Tag) : Value(std::forward<U>(Value)), Tag(Tag) {} Tagged(U &&Value, VFSTag Tag)
: Value(std::forward<U>(Value)), Tag(std::move(Tag)) {}
template <class U> template <class U>
Tagged(const Tagged<U> &Other) : Value(Other.Value), Tag(Other.Tag) {} Tagged(const Tagged<U> &Other) : Value(Other.Value), Tag(Other.Tag) {}
template <class U> template <class U>
Tagged(Tagged<U> &&Other) : Value(std::move(Other.Value)), Tag(Other.Tag) {} Tagged(Tagged<U> &&Other)
: Value(std::move(Other.Value)), Tag(std::move(Other.Tag)) {}
T Value; T Value;
VFSTag Tag; VFSTag Tag;
}; };
template <class T> template <class T>
Tagged<typename std::decay<T>::type> make_tagged(T &&Value, VFSTag Tag) { Tagged<typename std::decay<T>::type> make_tagged(T &&Value, VFSTag Tag) {
return Tagged<T>(std::forward<T>(Value), Tag); return Tagged<T>(std::forward<T>(Value), Tag);
▲ Show 20 Lines • Show All 123 Lines • Show Last 20 Lines

unittests/clangd/ClangdTests.cpp

Show First 20 Lines • Show All 380 Lines • ▼ Show 20 Lines ClangdServer Server(
llvm::make_unique<MockCompilationDatabase>(), llvm::make_unique<MockCompilationDatabase>(),
getAndMove(llvm::make_unique<ErrorCheckingDiagConsumer>(), DiagConsumer), getAndMove(llvm::make_unique<ErrorCheckingDiagConsumer>(), DiagConsumer),
getAndMove(llvm::make_unique<MockFSProvider>(), FS), getAndMove(llvm::make_unique<MockFSProvider>(), FS),
/*RunSynchronously=*/true); /*RunSynchronously=*/true);
auto FooCpp = getVirtualTestFilePath("foo.cpp"); auto FooCpp = getVirtualTestFilePath("foo.cpp");
const auto SourceContents = "int a;"; const auto SourceContents = "int a;";
FS->Files[FooCpp] = SourceContents; FS->Files[FooCpp] = SourceContents;
FS->Tag = 123; FS->Tag = "123";
Server.addDocument(FooCpp, SourceContents); Server.addDocument(FooCpp, SourceContents);
EXPECT_EQ(DiagConsumer->lastVFSTag(), FS->Tag); EXPECT_EQ(DiagConsumer->lastVFSTag(), FS->Tag);
EXPECT_EQ(Server.codeComplete(FooCpp, Position{0, 0}).Tag, FS->Tag); EXPECT_EQ(Server.codeComplete(FooCpp, Position{0, 0}).Tag, FS->Tag);
FS->Tag = 321; FS->Tag = "321";
Server.addDocument(FooCpp, SourceContents); Server.addDocument(FooCpp, SourceContents);
EXPECT_EQ(DiagConsumer->lastVFSTag(), FS->Tag); EXPECT_EQ(DiagConsumer->lastVFSTag(), FS->Tag);
EXPECT_EQ(Server.codeComplete(FooCpp, Position{0, 0}).Tag, FS->Tag); EXPECT_EQ(Server.codeComplete(FooCpp, Position{0, 0}).Tag, FS->Tag);
} }
} // namespace clangd } // namespace clangd
} // namespace clang } // namespace clang