diff options
Diffstat (limited to 'clang-tools-extra/unittests/clangd')
33 files changed, 343 insertions, 347 deletions
diff --git a/clang-tools-extra/unittests/clangd/Annotations.cpp b/clang-tools-extra/unittests/clangd/Annotations.cpp index a53f70ca990..474ba05d042 100644 --- a/clang-tools-extra/unittests/clangd/Annotations.cpp +++ b/clang-tools-extra/unittests/clangd/Annotations.cpp @@ -10,26 +10,25 @@ #include "Annotations.h" #include "SourceCode.h" -using namespace llvm; namespace clang { namespace clangd { // Crash if the assertion fails, printing the message and testcase. // More elegant error handling isn't needed for unit tests. -static void require(bool Assertion, const char *Msg, StringRef Code) { +static void require(bool Assertion, const char *Msg, llvm::StringRef Code) { if (!Assertion) { - errs() << "Annotated testcase: " << Msg << "\n" << Code << "\n"; + llvm::errs() << "Annotated testcase: " << Msg << "\n" << Code << "\n"; llvm_unreachable("Annotated testcase assertion failed!"); } } -Annotations::Annotations(StringRef Text) { +Annotations::Annotations(llvm::StringRef Text) { auto Here = [this] { return offsetToPosition(Code, Code.size()); }; auto Require = [Text](bool Assertion, const char *Msg) { require(Assertion, Msg, Text); }; - Optional<StringRef> Name; - SmallVector<std::pair<StringRef, Position>, 8> OpenRanges; + llvm::Optional<llvm::StringRef> Name; + llvm::SmallVector<std::pair<llvm::StringRef, Position>, 8> OpenRanges; Code.reserve(Text.size()); while (!Text.empty()) { @@ -52,7 +51,7 @@ Annotations::Annotations(StringRef Text) { continue; } if (Text.consume_front("$")) { - Name = Text.take_while(isAlnum); + Name = Text.take_while(llvm::isAlnum); Text = Text.drop_front(Name->size()); continue; } @@ -63,23 +62,23 @@ Annotations::Annotations(StringRef Text) { Require(OpenRanges.empty(), "unmatched [["); } -Position Annotations::point(StringRef Name) const { +Position Annotations::point(llvm::StringRef Name) const { auto I = Points.find(Name); require(I != Points.end() && I->getValue().size() == 1, "expected exactly one point", Code); return I->getValue()[0]; } -std::vector<Position> Annotations::points(StringRef Name) const { +std::vector<Position> Annotations::points(llvm::StringRef Name) const { auto P = Points.lookup(Name); return {P.begin(), P.end()}; } -Range Annotations::range(StringRef Name) const { +Range Annotations::range(llvm::StringRef Name) const { auto I = Ranges.find(Name); require(I != Ranges.end() && I->getValue().size() == 1, "expected exactly one range", Code); return I->getValue()[0]; } -std::vector<Range> Annotations::ranges(StringRef Name) const { +std::vector<Range> Annotations::ranges(llvm::StringRef Name) const { auto R = Ranges.lookup(Name); return {R.begin(), R.end()}; } diff --git a/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp b/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp index 67993653dd3..c30968b51f2 100644 --- a/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp +++ b/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp @@ -13,7 +13,6 @@ using testing::ElementsAre; using testing::Not; using testing::UnorderedElementsAre; -using namespace llvm; namespace clang { namespace clangd { diff --git a/clang-tools-extra/unittests/clangd/CancellationTests.cpp b/clang-tools-extra/unittests/clangd/CancellationTests.cpp index 45a017001da..611ce07dd8e 100644 --- a/clang-tools-extra/unittests/clangd/CancellationTests.cpp +++ b/clang-tools-extra/unittests/clangd/CancellationTests.cpp @@ -8,7 +8,6 @@ #include <memory> #include <thread> -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -22,7 +21,7 @@ TEST(CancellationTest, CancellationTest) { } TEST(CancellationTest, CancelerDiesContextLives) { - Optional<WithContext> ContextWithCancellation; + llvm::Optional<WithContext> ContextWithCancellation; { auto Task = cancelableTask(); ContextWithCancellation.emplace(std::move(Task.first)); diff --git a/clang-tools-extra/unittests/clangd/ClangdTests.cpp b/clang-tools-extra/unittests/clangd/ClangdTests.cpp index a32c495b4a8..c1cc623a05a 100644 --- a/clang-tools-extra/unittests/clangd/ClangdTests.cpp +++ b/clang-tools-extra/unittests/clangd/ClangdTests.cpp @@ -30,7 +30,6 @@ #include <thread> #include <vector> -using namespace llvm; namespace clang { namespace clangd { @@ -109,14 +108,14 @@ public: private: mutable std::mutex Mutex; - StringMap<bool> LastDiagsHadError; + llvm::StringMap<bool> LastDiagsHadError; }; /// Replaces all patterns of the form 0x123abc with spaces std::string replacePtrsInDump(std::string const &Dump) { - Regex RE("0x[0-9a-fA-F]+"); - SmallVector<StringRef, 1> Matches; - StringRef Pending = Dump; + llvm::Regex RE("0x[0-9a-fA-F]+"); + llvm::SmallVector<llvm::StringRef, 1> Matches; + llvm::StringRef Pending = Dump; std::string Result; while (RE.match(Pending, &Matches)) { @@ -139,8 +138,8 @@ std::string dumpASTWithoutMemoryLocs(ClangdServer &Server, PathRef File) { class ClangdVFSTest : public ::testing::Test { protected: std::string parseSourceAndDumpAST( - PathRef SourceFileRelPath, StringRef SourceContents, - std::vector<std::pair<PathRef, StringRef>> ExtraFiles = {}, + PathRef SourceFileRelPath, llvm::StringRef SourceContents, + std::vector<std::pair<PathRef, llvm::StringRef>> ExtraFiles = {}, bool ExpectErrors = false) { MockFSProvider FS; ErrorCheckingDiagConsumer DiagConsumer; @@ -269,7 +268,7 @@ int b = a; TEST_F(ClangdVFSTest, PropagatesContexts) { static Key<int> Secret; struct FSProvider : public FileSystemProvider { - IntrusiveRefCntPtr<vfs::FileSystem> getFileSystem() const override { + IntrusiveRefCntPtr<llvm::vfs::FileSystem> getFileSystem() const override { Got = Context::current().getExisting(Secret); return buildTestFS({}); } @@ -313,19 +312,19 @@ TEST_F(ClangdVFSTest, SearchLibDir) { // A lib dir for gcc installation SmallString<64> LibDir("/randomusr/lib/gcc/x86_64-linux-gnu"); - sys::path::append(LibDir, Version); + llvm::sys::path::append(LibDir, Version); // Put crtbegin.o into LibDir/64 to trick clang into thinking there's a gcc // installation there. SmallString<64> DummyLibFile; - sys::path::append(DummyLibFile, LibDir, "64", "crtbegin.o"); + llvm::sys::path::append(DummyLibFile, LibDir, "64", "crtbegin.o"); FS.Files[DummyLibFile] = ""; SmallString<64> IncludeDir("/randomusr/include/c++"); - sys::path::append(IncludeDir, Version); + llvm::sys::path::append(IncludeDir, Version); SmallString<64> StringPath; - sys::path::append(StringPath, IncludeDir, "string"); + llvm::sys::path::append(StringPath, IncludeDir, "string"); FS.Files[StringPath] = "class mock_string {};"; auto FooCpp = testPath("foo.cpp"); @@ -598,7 +597,7 @@ int d; void onDiagnosticsReady(PathRef File, std::vector<Diag> Diagnostics) override { - StringRef FileIndexStr = sys::path::stem(File); + StringRef FileIndexStr = llvm::sys::path::stem(File); ASSERT_TRUE(FileIndexStr.consume_front("Foo")); unsigned long FileIndex = std::stoul(FileIndexStr.str()); @@ -976,28 +975,28 @@ TEST_F(ClangdVFSTest, ChangedHeaderFromISystem) { TEST(ClangdTests, PreambleVFSStatCache) { class ListenStatsFSProvider : public FileSystemProvider { public: - ListenStatsFSProvider(StringMap<unsigned> &CountStats) + ListenStatsFSProvider(llvm::StringMap<unsigned> &CountStats) : CountStats(CountStats) {} - IntrusiveRefCntPtr<vfs::FileSystem> getFileSystem() const override { - class ListenStatVFS : public vfs::ProxyFileSystem { + IntrusiveRefCntPtr<llvm::vfs::FileSystem> getFileSystem() const override { + class ListenStatVFS : public llvm::vfs::ProxyFileSystem { public: - ListenStatVFS(IntrusiveRefCntPtr<vfs::FileSystem> FS, - StringMap<unsigned> &CountStats) + ListenStatVFS(IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS, + llvm::StringMap<unsigned> &CountStats) : ProxyFileSystem(std::move(FS)), CountStats(CountStats) {} - ErrorOr<std::unique_ptr<vfs::File>> + llvm::ErrorOr<std::unique_ptr<llvm::vfs::File>> openFileForRead(const Twine &Path) override { - ++CountStats[sys::path::filename(Path.str())]; + ++CountStats[llvm::sys::path::filename(Path.str())]; return ProxyFileSystem::openFileForRead(Path); } - ErrorOr<vfs::Status> status(const Twine &Path) override { - ++CountStats[sys::path::filename(Path.str())]; + llvm::ErrorOr<llvm::vfs::Status> status(const Twine &Path) override { + ++CountStats[llvm::sys::path::filename(Path.str())]; return ProxyFileSystem::status(Path); } private: - StringMap<unsigned> &CountStats; + llvm::StringMap<unsigned> &CountStats; }; return IntrusiveRefCntPtr<ListenStatVFS>( @@ -1005,11 +1004,11 @@ TEST(ClangdTests, PreambleVFSStatCache) { } // If relative paths are used, they are resolved with testPath(). - StringMap<std::string> Files; - StringMap<unsigned> &CountStats; + llvm::StringMap<std::string> Files; + llvm::StringMap<unsigned> &CountStats; }; - StringMap<unsigned> CountStats; + llvm::StringMap<unsigned> CountStats; ListenStatsFSProvider FS(CountStats); ErrorCheckingDiagConsumer DiagConsumer; MockCompilationDatabase CDB; diff --git a/clang-tools-extra/unittests/clangd/ClangdUnitTests.cpp b/clang-tools-extra/unittests/clangd/ClangdUnitTests.cpp index e1942d40688..d0b85fd421e 100644 --- a/clang-tools-extra/unittests/clangd/ClangdUnitTests.cpp +++ b/clang-tools-extra/unittests/clangd/ClangdUnitTests.cpp @@ -15,7 +15,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -35,23 +34,24 @@ testing::Matcher<const Diag &> WithNote(testing::Matcher<Note> NoteMatcher) { } MATCHER_P2(Diag, Range, Message, - "Diag at " + to_string(Range) + " = [" + Message + "]") { + "Diag at " + llvm::to_string(Range) + " = [" + Message + "]") { return arg.Range == Range && arg.Message == Message; } MATCHER_P3(Fix, Range, Replacement, Message, - "Fix " + to_string(Range) + " => " + + "Fix " + llvm::to_string(Range) + " => " + testing::PrintToString(Replacement) + " = [" + Message + "]") { return arg.Message == Message && arg.Edits.size() == 1 && arg.Edits[0].range == Range && arg.Edits[0].newText == Replacement; } -MATCHER_P(EqualToLSPDiag, LSPDiag, "LSP diagnostic " + to_string(LSPDiag)) { +MATCHER_P(EqualToLSPDiag, LSPDiag, + "LSP diagnostic " + llvm::to_string(LSPDiag)) { return std::tie(arg.range, arg.severity, arg.message) == std::tie(LSPDiag.range, LSPDiag.severity, LSPDiag.message); } -MATCHER_P(EqualToFix, Fix, "LSP fix " + to_string(Fix)) { +MATCHER_P(EqualToFix, Fix, "LSP fix " + llvm::to_string(Fix)) { if (arg.Message != Fix.Message) return false; if (arg.Edits.size() != Fix.Edits.size()) diff --git a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp index 12be7d05f6a..aa724badf55 100644 --- a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp +++ b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp @@ -24,11 +24,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { +using ::llvm::Failed; using ::testing::AllOf; using ::testing::Contains; using ::testing::Each; @@ -87,7 +87,7 @@ std::unique_ptr<SymbolIndex> memIndex(std::vector<Symbol> Symbols) { return MemIndex::build(std::move(Slab).build(), RefSlab()); } -CodeCompleteResult completions(ClangdServer &Server, StringRef TestCode, +CodeCompleteResult completions(ClangdServer &Server, llvm::StringRef TestCode, Position point, std::vector<Symbol> IndexSymbols = {}, clangd::CodeCompleteOptions Opts = {}) { @@ -100,11 +100,12 @@ CodeCompleteResult completions(ClangdServer &Server, StringRef TestCode, auto File = testPath("foo.cpp"); runAddDocument(Server, File, TestCode); - auto CompletionList = cantFail(runCodeComplete(Server, File, point, Opts)); + auto CompletionList = + llvm::cantFail(runCodeComplete(Server, File, point, Opts)); return CompletionList; } -CodeCompleteResult completions(ClangdServer &Server, StringRef Text, +CodeCompleteResult completions(ClangdServer &Server, llvm::StringRef Text, std::vector<Symbol> IndexSymbols = {}, clangd::CodeCompleteOptions Opts = {}, PathRef FilePath = "foo.cpp") { @@ -119,13 +120,13 @@ CodeCompleteResult completions(ClangdServer &Server, StringRef Text, Annotations Test(Text); runAddDocument(Server, File, Test.code()); auto CompletionList = - cantFail(runCodeComplete(Server, File, Test.point(), Opts)); + llvm::cantFail(runCodeComplete(Server, File, Test.point(), Opts)); return CompletionList; } // Builds a server and runs code completion. // If IndexSymbols is non-empty, an index will be built and passed to opts. -CodeCompleteResult completions(StringRef Text, +CodeCompleteResult completions(llvm::StringRef Text, std::vector<Symbol> IndexSymbols = {}, clangd::CodeCompleteOptions Opts = {}, PathRef FilePath = "foo.cpp") { @@ -137,10 +138,11 @@ CodeCompleteResult completions(StringRef Text, FilePath); } -std::string replace(StringRef Haystack, StringRef Needle, StringRef Repl) { +std::string replace(llvm::StringRef Haystack, llvm::StringRef Needle, + llvm::StringRef Repl) { std::string Result; - raw_string_ostream OS(Result); - std::pair<StringRef, StringRef> Split; + llvm::raw_string_ostream OS(Result); + std::pair<llvm::StringRef, llvm::StringRef> Split; for (Split = Haystack.split(Needle); !Split.second.empty(); Split = Split.first.split(Needle)) OS << Split.first << Repl; @@ -151,11 +153,12 @@ std::string replace(StringRef Haystack, StringRef Needle, StringRef Repl) { // Helpers to produce fake index symbols for memIndex() or completions(). // USRFormat is a regex replacement string for the unqualified part of the USR. -Symbol sym(StringRef QName, index::SymbolKind Kind, StringRef USRFormat) { +Symbol sym(llvm::StringRef QName, index::SymbolKind Kind, + llvm::StringRef USRFormat) { Symbol Sym; std::string USR = "c:"; // We synthesize a few simple cases of USRs by hand! size_t Pos = QName.rfind("::"); - if (Pos == StringRef::npos) { + if (Pos == llvm::StringRef::npos) { Sym.Name = QName; Sym.Scope = ""; } else { @@ -163,23 +166,23 @@ Symbol sym(StringRef QName, index::SymbolKind Kind, StringRef USRFormat) { Sym.Scope = QName.substr(0, Pos + 2); USR += "@N@" + replace(QName.substr(0, Pos), "::", "@N@"); // ns:: -> @N@ns } - USR += Regex("^.*$").sub(USRFormat, Sym.Name); // e.g. func -> @F@func# + USR += llvm::Regex("^.*$").sub(USRFormat, Sym.Name); // e.g. func -> @F@func# Sym.ID = SymbolID(USR); Sym.SymInfo.Kind = Kind; Sym.Flags |= Symbol::IndexedForCodeCompletion; Sym.Origin = SymbolOrigin::Static; return Sym; } -Symbol func(StringRef Name) { // Assumes the function has no args. +Symbol func(llvm::StringRef Name) { // Assumes the function has no args. return sym(Name, index::SymbolKind::Function, "@F@\\0#"); // no args } -Symbol cls(StringRef Name) { +Symbol cls(llvm::StringRef Name) { return sym(Name, index::SymbolKind::Class, "@S@\\0"); } -Symbol var(StringRef Name) { +Symbol var(llvm::StringRef Name) { return sym(Name, index::SymbolKind::Variable, "@\\0"); } -Symbol ns(StringRef Name) { +Symbol ns(llvm::StringRef Name) { return sym(Name, index::SymbolKind::Namespace, "@N@\\0"); } Symbol withReferences(int N, Symbol S) { @@ -862,7 +865,7 @@ TEST(CompletionTest, IgnoreCompleteInExcludedPPBranchWithRecoveryContext) { EXPECT_TRUE(Results.Completions.empty()); } -SignatureHelp signatures(StringRef Text, Position Point, +SignatureHelp signatures(llvm::StringRef Text, Position Point, std::vector<Symbol> IndexSymbols = {}) { std::unique_ptr<SymbolIndex> Index; if (!IndexSymbols.empty()) @@ -877,10 +880,10 @@ SignatureHelp signatures(StringRef Text, Position Point, ClangdServer Server(CDB, FS, DiagConsumer, Opts); auto File = testPath("foo.cpp"); runAddDocument(Server, File, Text); - return cantFail(runSignatureHelp(Server, File, Point)); + return llvm::cantFail(runSignatureHelp(Server, File, Point)); } -SignatureHelp signatures(StringRef Text, +SignatureHelp signatures(llvm::StringRef Text, std::vector<Symbol> IndexSymbols = {}) { Annotations Test(Text); return signatures(Test.code(), Test.point(), std::move(IndexSymbols)); @@ -998,18 +1001,19 @@ TEST(SignatureHelpTest, OpeningParen) { class IndexRequestCollector : public SymbolIndex { public: - bool fuzzyFind(const FuzzyFindRequest &Req, - function_ref<void(const Symbol &)> Callback) const override { + bool + fuzzyFind(const FuzzyFindRequest &Req, + llvm::function_ref<void(const Symbol &)> Callback) const override { std::lock_guard<std::mutex> Lock(Mut); Requests.push_back(Req); return true; } void lookup(const LookupRequest &, - function_ref<void(const Symbol &)>) const override {} + llvm::function_ref<void(const Symbol &)>) const override {} void refs(const RefsRequest &, - function_ref<void(const Ref &)>) const override {} + llvm::function_ref<void(const Ref &)>) const override {} // This is incorrect, but IndexRequestCollector is not an actual index and it // isn't used in production code. @@ -1028,7 +1032,7 @@ private: mutable std::vector<FuzzyFindRequest> Requests; }; -std::vector<FuzzyFindRequest> captureIndexRequests(StringRef Code) { +std::vector<FuzzyFindRequest> captureIndexRequests(llvm::StringRef Code) { clangd::CodeCompleteOptions Opts; IndexRequestCollector Requests; Opts.Index = &Requests; diff --git a/clang-tools-extra/unittests/clangd/DexTests.cpp b/clang-tools-extra/unittests/clangd/DexTests.cpp index 012964a3276..6c347b65052 100644 --- a/clang-tools-extra/unittests/clangd/DexTests.cpp +++ b/clang-tools-extra/unittests/clangd/DexTests.cpp @@ -27,7 +27,6 @@ using ::testing::AnyOf; using ::testing::ElementsAre; using ::testing::UnorderedElementsAre; -using namespace llvm; namespace clang { namespace clangd { namespace dex { @@ -248,17 +247,17 @@ TEST(DexIterators, StringRepresentation) { // No token given, prints full posting list. auto I1 = L1.iterator(); - EXPECT_EQ(to_string(*I1), "[1 3 5]"); + EXPECT_EQ(llvm::to_string(*I1), "[1 3 5]"); // Token given, uses token's string representation. Token Tok(Token::Kind::Trigram, "L2"); auto I2 = L1.iterator(&Tok); - EXPECT_EQ(to_string(*I2), "T=L2"); + EXPECT_EQ(llvm::to_string(*I2), "T=L2"); auto Tree = C.limit(C.intersect(move(I1), move(I2)), 10); // AND reorders its children, we don't care which order it prints. - EXPECT_THAT(to_string(*Tree), AnyOf("(LIMIT 10 (& [1 3 5] T=L2))", - "(LIMIT 10 (& T=L2 [1 3 5]))")); + EXPECT_THAT(llvm::to_string(*Tree), AnyOf("(LIMIT 10 (& [1 3 5] T=L2))", + "(LIMIT 10 (& T=L2 [1 3 5]))")); } TEST(DexIterators, Limit) { @@ -323,27 +322,28 @@ TEST(DexIterators, Optimizations) { const PostingList L3{3}; // empty and/or yield true/false - EXPECT_EQ(to_string(*C.intersect()), "true"); - EXPECT_EQ(to_string(*C.unionOf()), "false"); + EXPECT_EQ(llvm::to_string(*C.intersect()), "true"); + EXPECT_EQ(llvm::to_string(*C.unionOf()), "false"); // true/false inside and/or short-circuit - EXPECT_EQ(to_string(*C.intersect(L1.iterator(), C.all())), "[1]"); - EXPECT_EQ(to_string(*C.intersect(L1.iterator(), C.none())), "false"); + EXPECT_EQ(llvm::to_string(*C.intersect(L1.iterator(), C.all())), "[1]"); + EXPECT_EQ(llvm::to_string(*C.intersect(L1.iterator(), C.none())), "false"); // Not optimized to avoid breaking boosts. - EXPECT_EQ(to_string(*C.unionOf(L1.iterator(), C.all())), "(| [1] true)"); - EXPECT_EQ(to_string(*C.unionOf(L1.iterator(), C.none())), "[1]"); + EXPECT_EQ(llvm::to_string(*C.unionOf(L1.iterator(), C.all())), + "(| [1] true)"); + EXPECT_EQ(llvm::to_string(*C.unionOf(L1.iterator(), C.none())), "[1]"); // and/or nested inside and/or are flattened - EXPECT_EQ(to_string(*C.intersect(L1.iterator(), - C.intersect(L1.iterator(), L1.iterator()))), + EXPECT_EQ(llvm::to_string(*C.intersect( + L1.iterator(), C.intersect(L1.iterator(), L1.iterator()))), "(& [1] [1] [1])"); - EXPECT_EQ(to_string(*C.unionOf(L1.iterator(), - C.unionOf(L2.iterator(), L3.iterator()))), + EXPECT_EQ(llvm::to_string(*C.unionOf( + L1.iterator(), C.unionOf(L2.iterator(), L3.iterator()))), "(| [1] [2] [3])"); // optimizations combine over multiple levels - EXPECT_EQ(to_string(*C.intersect(C.intersect(L1.iterator(), C.intersect()), - C.unionOf(C.all()))), + EXPECT_EQ(llvm::to_string(*C.intersect( + C.intersect(L1.iterator(), C.intersect()), C.unionOf(C.all()))), "[1]"); } @@ -657,7 +657,7 @@ TEST(DexTest, ProximityPathsBoosting) { } TEST(DexTests, Refs) { - DenseMap<SymbolID, std::vector<Ref>> Refs; + llvm::DenseMap<SymbolID, std::vector<Ref>> Refs; auto AddRef = [&](const Symbol &Sym, const char *Filename, RefKind Kind) { auto &SymbolRefs = Refs[Sym.ID]; SymbolRefs.emplace_back(); diff --git a/clang-tools-extra/unittests/clangd/DraftStoreTests.cpp b/clang-tools-extra/unittests/clangd/DraftStoreTests.cpp index 44faa8bdd18..78057f3a5e3 100644 --- a/clang-tools-extra/unittests/clangd/DraftStoreTests.cpp +++ b/clang-tools-extra/unittests/clangd/DraftStoreTests.cpp @@ -13,29 +13,28 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { struct IncrementalTestStep { - StringRef Src; - StringRef Contents; + llvm::StringRef Src; + llvm::StringRef Contents; }; -int rangeLength(StringRef Code, const Range &Rng) { - Expected<size_t> Start = positionToOffset(Code, Rng.start); - Expected<size_t> End = positionToOffset(Code, Rng.end); +int rangeLength(llvm::StringRef Code, const Range &Rng) { + llvm::Expected<size_t> Start = positionToOffset(Code, Rng.start); + llvm::Expected<size_t> End = positionToOffset(Code, Rng.end); assert(Start); assert(End); return *End - *Start; } /// Send the changes one by one to updateDraft, verify the intermediate results. -void stepByStep(ArrayRef<IncrementalTestStep> Steps) { +void stepByStep(llvm::ArrayRef<IncrementalTestStep> Steps) { DraftStore DS; Annotations InitialSrc(Steps.front().Src); - constexpr StringLiteral Path("/hello.cpp"); + constexpr llvm::StringLiteral Path("/hello.cpp"); // Set the initial content. DS.addDraft(Path, InitialSrc.code()); @@ -43,14 +42,14 @@ void stepByStep(ArrayRef<IncrementalTestStep> Steps) { for (size_t i = 1; i < Steps.size(); i++) { Annotations SrcBefore(Steps[i - 1].Src); Annotations SrcAfter(Steps[i].Src); - StringRef Contents = Steps[i - 1].Contents; + llvm::StringRef Contents = Steps[i - 1].Contents; TextDocumentContentChangeEvent Event{ SrcBefore.range(), rangeLength(SrcBefore.code(), SrcBefore.range()), Contents.str(), }; - Expected<std::string> Result = DS.updateDraft(Path, {Event}); + llvm::Expected<std::string> Result = DS.updateDraft(Path, {Event}); ASSERT_TRUE(!!Result); EXPECT_EQ(*Result, SrcAfter.code()); EXPECT_EQ(*DS.getDraft(Path), SrcAfter.code()); @@ -58,16 +57,16 @@ void stepByStep(ArrayRef<IncrementalTestStep> Steps) { } /// Send all the changes at once to updateDraft, check only the final result. -void allAtOnce(ArrayRef<IncrementalTestStep> Steps) { +void allAtOnce(llvm::ArrayRef<IncrementalTestStep> Steps) { DraftStore DS; Annotations InitialSrc(Steps.front().Src); Annotations FinalSrc(Steps.back().Src); - constexpr StringLiteral Path("/hello.cpp"); + constexpr llvm::StringLiteral Path("/hello.cpp"); std::vector<TextDocumentContentChangeEvent> Changes; for (size_t i = 0; i < Steps.size() - 1; i++) { Annotations Src(Steps[i].Src); - StringRef Contents = Steps[i].Contents; + llvm::StringRef Contents = Steps[i].Contents; Changes.push_back({ Src.range(), @@ -79,9 +78,9 @@ void allAtOnce(ArrayRef<IncrementalTestStep> Steps) { // Set the initial content. DS.addDraft(Path, InitialSrc.code()); - Expected<std::string> Result = DS.updateDraft(Path, Changes); + llvm::Expected<std::string> Result = DS.updateDraft(Path, Changes); - ASSERT_TRUE(!!Result) << toString(Result.takeError()); + ASSERT_TRUE(!!Result) << llvm::toString(Result.takeError()); EXPECT_EQ(*Result, FinalSrc.code()); EXPECT_EQ(*DS.getDraft(Path), FinalSrc.code()); } diff --git a/clang-tools-extra/unittests/clangd/ExpectedTypeTest.cpp b/clang-tools-extra/unittests/clangd/ExpectedTypeTest.cpp index e739869e437..de3b486da3c 100644 --- a/clang-tools-extra/unittests/clangd/ExpectedTypeTest.cpp +++ b/clang-tools-extra/unittests/clangd/ExpectedTypeTest.cpp @@ -17,8 +17,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; - namespace clang { namespace clangd { namespace { @@ -30,21 +28,21 @@ using ::testing::UnorderedElementsAreArray; class ExpectedTypeConversionTest : public ::testing::Test { protected: - void build(StringRef Code) { + void build(llvm::StringRef Code) { assert(!AST && "AST built twice"); AST = TestTU::withCode(Code).build(); } - const ValueDecl *decl(StringRef Name) { + const ValueDecl *decl(llvm::StringRef Name) { return &cast<ValueDecl>(findDecl(*AST, Name)); } - QualType typeOf(StringRef Name) { + QualType typeOf(llvm::StringRef Name) { return decl(Name)->getType().getCanonicalType(); } /// An overload for convenience. - Optional<OpaqueType> fromCompletionResult(const ValueDecl *D) { + llvm::Optional<OpaqueType> fromCompletionResult(const ValueDecl *D) { return OpaqueType::fromCompletionResult( ASTCtx(), CodeCompletionResult(D, CCP_Declaration)); } @@ -54,7 +52,7 @@ protected: using EquivClass = std::set<std::string>; Matcher<std::map<std::string, EquivClass>> - ClassesAre(ArrayRef<EquivClass> Classes) { + ClassesAre(llvm::ArrayRef<EquivClass> Classes) { using MapEntry = std::map<std::string, EquivClass>::value_type; std::vector<Matcher<MapEntry>> Elements; @@ -67,9 +65,9 @@ protected: // Groups \p Decls into equivalence classes based on the result of // 'OpaqueType::fromCompletionResult'. std::map<std::string, EquivClass> - buildEquivClasses(ArrayRef<StringRef> DeclNames) { + buildEquivClasses(llvm::ArrayRef<llvm::StringRef> DeclNames) { std::map<std::string, EquivClass> Classes; - for (StringRef Name : DeclNames) { + for (llvm::StringRef Name : DeclNames) { auto Type = OpaqueType::fromType(ASTCtx(), typeOf(Name)); Classes[Type->raw()].insert(Name); } @@ -80,7 +78,7 @@ protected: private: // Set after calling build(). - Optional<ParsedAST> AST; + llvm::Optional<ParsedAST> AST; }; TEST_F(ExpectedTypeConversionTest, BasicTypes) { diff --git a/clang-tools-extra/unittests/clangd/FSTests.cpp b/clang-tools-extra/unittests/clangd/FSTests.cpp index 74dde3b2da0..6c0bfec5c84 100644 --- a/clang-tools-extra/unittests/clangd/FSTests.cpp +++ b/clang-tools-extra/unittests/clangd/FSTests.cpp @@ -12,13 +12,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { TEST(FSTests, PreambleStatusCache) { - StringMap<std::string> Files; + llvm::StringMap<std::string> Files; Files["x"] = ""; Files["y"] = ""; Files["main"] = ""; @@ -36,9 +35,10 @@ TEST(FSTests, PreambleStatusCache) { // Main file is not cached. EXPECT_FALSE(StatCache.lookup(testPath("main")).hasValue()); - vfs::Status S("fake", sys::fs::UniqueID(0, 0), - std::chrono::system_clock::now(), 0, 0, 1024, - sys::fs::file_type::regular_file, sys::fs::all_all); + llvm::vfs::Status S("fake", llvm::sys::fs::UniqueID(0, 0), + std::chrono::system_clock::now(), 0, 0, 1024, + llvm::sys::fs::file_type::regular_file, + llvm::sys::fs::all_all); StatCache.update(*FS, S); auto ConsumeFS = StatCache.getConsumingFS(FS); auto Cached = ConsumeFS->status(testPath("fake")); diff --git a/clang-tools-extra/unittests/clangd/FileIndexTests.cpp b/clang-tools-extra/unittests/clangd/FileIndexTests.cpp index 0f8e9e60330..c3b11aef0de 100644 --- a/clang-tools-extra/unittests/clangd/FileIndexTests.cpp +++ b/clang-tools-extra/unittests/clangd/FileIndexTests.cpp @@ -31,7 +31,6 @@ using testing::ElementsAre; using testing::IsEmpty; using testing::Pair; using testing::UnorderedElementsAre; -using namespace llvm; MATCHER_P(RefRange, Range, "") { return std::make_tuple(arg.Location.Start.line(), arg.Location.Start.column(), @@ -39,11 +38,13 @@ MATCHER_P(RefRange, Range, "") { std::make_tuple(Range.start.line, Range.start.character, Range.end.line, Range.end.character); } -MATCHER_P(FileURI, F, "") { return StringRef(arg.Location.FileURI) == F; } +MATCHER_P(FileURI, F, "") { return llvm::StringRef(arg.Location.FileURI) == F; } MATCHER_P(DeclURI, U, "") { - return StringRef(arg.CanonicalDeclaration.FileURI) == U; + return llvm::StringRef(arg.CanonicalDeclaration.FileURI) == U; +} +MATCHER_P(DefURI, U, "") { + return llvm::StringRef(arg.Definition.FileURI) == U; } -MATCHER_P(DefURI, U, "") { return StringRef(arg.Definition.FileURI) == U; } MATCHER_P(QName, N, "") { return (arg.Scope + arg.Name).str() == N; } namespace clang { @@ -54,7 +55,7 @@ RefsAre(std::vector<testing::Matcher<Ref>> Matchers) { return ElementsAre(testing::Pair(_, UnorderedElementsAreArray(Matchers))); } -Symbol symbol(StringRef ID) { +Symbol symbol(llvm::StringRef ID) { Symbol Sym; Sym.ID = SymbolID(ID); Sym.Name = ID; @@ -103,7 +104,7 @@ TEST(FileSymbolsTest, MergeOverlap) { auto OneSymboSlab = [](Symbol Sym) { SymbolSlab::Builder S; S.insert(Sym); - return make_unique<SymbolSlab>(std::move(S).build()); + return llvm::make_unique<SymbolSlab>(std::move(S).build()); }; auto X1 = symbol("x"); X1.CanonicalDeclaration.FileURI = "file:///x1"; @@ -141,7 +142,7 @@ TEST(FileSymbolsTest, SnapshotAliveAfterRemove) { } // Adds Basename.cpp, which includes Basename.h, which contains Code. -void update(FileIndex &M, StringRef Basename, StringRef Code) { +void update(FileIndex &M, llvm::StringRef Basename, llvm::StringRef Code) { TestTU File; File.Filename = (Basename + ".cpp").str(); File.HeaderFilename = (Basename + ".h").str(); @@ -246,7 +247,7 @@ TEST(FileIndexTest, RebuildWithPreamble) { PI.CompileCommand.Filename = FooCpp; PI.CompileCommand.CommandLine = {"clang", "-xc++", FooCpp}; - StringMap<std::string> Files; + llvm::StringMap<std::string> Files; Files[FooCpp] = ""; Files[FooH] = R"cpp( namespace ns_in_header { @@ -362,7 +363,7 @@ TEST(FileIndexTest, ReferencesInMainFileWithPreamble) { // Build AST for main file with preamble. auto AST = ParsedAST::build(createInvocationFromCommandLine(Cmd), PreambleData, - MemoryBuffer::getMemBufferCopy(Main.code()), + llvm::MemoryBuffer::getMemBufferCopy(Main.code()), std::make_shared<PCHContainerOperations>(), PI.FS); ASSERT_TRUE(AST); FileIndex Index; diff --git a/clang-tools-extra/unittests/clangd/FindSymbolsTests.cpp b/clang-tools-extra/unittests/clangd/FindSymbolsTests.cpp index 511c46e3e4d..e49091036ce 100644 --- a/clang-tools-extra/unittests/clangd/FindSymbolsTests.cpp +++ b/clang-tools-extra/unittests/clangd/FindSymbolsTests.cpp @@ -14,8 +14,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; - namespace clang { namespace clangd { @@ -73,14 +71,14 @@ protected: ClangdServer Server; int Limit = 0; - std::vector<SymbolInformation> getSymbols(StringRef Query) { + std::vector<SymbolInformation> getSymbols(llvm::StringRef Query) { EXPECT_TRUE(Server.blockUntilIdleForTest()) << "Waiting for preamble"; auto SymbolInfos = runWorkspaceSymbols(Server, Query, Limit); EXPECT_TRUE(bool(SymbolInfos)) << "workspaceSymbols returned an error"; return *SymbolInfos; } - void addFile(StringRef FileName, StringRef Contents) { + void addFile(llvm::StringRef FileName, llvm::StringRef Contents) { auto Path = testPath(FileName); FSProvider.Files[Path] = Contents; Server.addDocument(Path, Contents); @@ -318,7 +316,7 @@ protected: return *SymbolInfos; } - void addFile(StringRef FilePath, StringRef Contents) { + void addFile(llvm::StringRef FilePath, llvm::StringRef Contents) { FSProvider.Files[FilePath] = Contents; Server.addDocument(FilePath, Contents); } diff --git a/clang-tools-extra/unittests/clangd/FunctionTests.cpp b/clang-tools-extra/unittests/clangd/FunctionTests.cpp index 1311ee43b99..613190dde84 100644 --- a/clang-tools-extra/unittests/clangd/FunctionTests.cpp +++ b/clang-tools-extra/unittests/clangd/FunctionTests.cpp @@ -11,7 +11,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { diff --git a/clang-tools-extra/unittests/clangd/FuzzyMatchTests.cpp b/clang-tools-extra/unittests/clangd/FuzzyMatchTests.cpp index b1981a62301..1c4062ca730 100644 --- a/clang-tools-extra/unittests/clangd/FuzzyMatchTests.cpp +++ b/clang-tools-extra/unittests/clangd/FuzzyMatchTests.cpp @@ -13,7 +13,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -21,17 +20,18 @@ using testing::Not; struct ExpectedMatch { // Annotations are optional, and will not be asserted if absent. - ExpectedMatch(StringRef Match) : Word(Match), Annotated(Match) { + ExpectedMatch(llvm::StringRef Match) : Word(Match), Annotated(Match) { for (char C : "[]") Word.erase(std::remove(Word.begin(), Word.end(), C), Word.end()); if (Word.size() == Annotated->size()) - Annotated = None; + Annotated = llvm::None; } - bool accepts(StringRef ActualAnnotated) const { + bool accepts(llvm::StringRef ActualAnnotated) const { return !Annotated || ActualAnnotated == *Annotated; } - friend raw_ostream &operator<<(raw_ostream &OS, const ExpectedMatch &M) { + friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, + const ExpectedMatch &M) { OS << "'" << M.Word; if (M.Annotated) OS << "' as " << *M.Annotated; @@ -41,26 +41,27 @@ struct ExpectedMatch { std::string Word; private: - Optional<StringRef> Annotated; + llvm::Optional<llvm::StringRef> Annotated; }; -struct MatchesMatcher : public testing::MatcherInterface<StringRef> { +struct MatchesMatcher : public testing::MatcherInterface<llvm::StringRef> { ExpectedMatch Candidate; - Optional<float> Score; - MatchesMatcher(ExpectedMatch Candidate, Optional<float> Score) + llvm::Optional<float> Score; + MatchesMatcher(ExpectedMatch Candidate, llvm::Optional<float> Score) : Candidate(std::move(Candidate)), Score(Score) {} void DescribeTo(::std::ostream *OS) const override { - raw_os_ostream(*OS) << "Matches " << Candidate; + llvm::raw_os_ostream(*OS) << "Matches " << Candidate; if (Score) *OS << " with score " << *Score; } - bool MatchAndExplain(StringRef Pattern, + bool MatchAndExplain(llvm::StringRef Pattern, testing::MatchResultListener *L) const override { - std::unique_ptr<raw_ostream> OS( - L->stream() ? (raw_ostream *)(new raw_os_ostream(*L->stream())) - : new raw_null_ostream()); + std::unique_ptr<llvm::raw_ostream> OS( + L->stream() + ? (llvm::raw_ostream *)(new llvm::raw_os_ostream(*L->stream())) + : new llvm::raw_null_ostream()); FuzzyMatcher Matcher(Pattern); auto Result = Matcher.match(Candidate.Word); auto AnnotatedMatch = Matcher.dumpLast(*OS << "\n"); @@ -71,8 +72,9 @@ struct MatchesMatcher : public testing::MatcherInterface<StringRef> { // Accepts patterns that match a given word, optionally requiring a score. // Dumps the debug tables on match failure. -testing::Matcher<StringRef> matches(StringRef M, Optional<float> Score = {}) { - return testing::MakeMatcher<StringRef>(new MatchesMatcher(M, Score)); +testing::Matcher<llvm::StringRef> matches(llvm::StringRef M, + llvm::Optional<float> Score = {}) { + return testing::MakeMatcher<llvm::StringRef>(new MatchesMatcher(M, Score)); } TEST(FuzzyMatch, Matches) { @@ -178,27 +180,28 @@ TEST(FuzzyMatch, Matches) { EXPECT_THAT("std", Not(matches("pthread_condattr_setpshared"))); } -struct RankMatcher : public testing::MatcherInterface<StringRef> { +struct RankMatcher : public testing::MatcherInterface<llvm::StringRef> { std::vector<ExpectedMatch> RankedStrings; RankMatcher(std::initializer_list<ExpectedMatch> RankedStrings) : RankedStrings(RankedStrings) {} void DescribeTo(::std::ostream *OS) const override { - raw_os_ostream O(*OS); + llvm::raw_os_ostream O(*OS); O << "Ranks strings in order: ["; for (const auto &Str : RankedStrings) O << "\n\t" << Str; O << "\n]"; } - bool MatchAndExplain(StringRef Pattern, + bool MatchAndExplain(llvm::StringRef Pattern, testing::MatchResultListener *L) const override { - std::unique_ptr<raw_ostream> OS( - L->stream() ? (raw_ostream *)(new raw_os_ostream(*L->stream())) - : new raw_null_ostream()); + std::unique_ptr<llvm::raw_ostream> OS( + L->stream() + ? (llvm::raw_ostream *)(new llvm::raw_os_ostream(*L->stream())) + : new llvm::raw_null_ostream()); FuzzyMatcher Matcher(Pattern); const ExpectedMatch *LastMatch; - Optional<float> LastScore; + llvm::Optional<float> LastScore; bool Ok = true; for (const auto &Str : RankedStrings) { auto Score = Matcher.match(Str.Word); @@ -208,7 +211,7 @@ struct RankMatcher : public testing::MatcherInterface<StringRef> { Ok = false; } else { std::string Buf; - raw_string_ostream Info(Buf); + llvm::raw_string_ostream Info(Buf); auto AnnotatedMatch = Matcher.dumpLast(Info); if (!Str.accepts(AnnotatedMatch)) { @@ -233,8 +236,9 @@ struct RankMatcher : public testing::MatcherInterface<StringRef> { // Accepts patterns that match all the strings and rank them in the given order. // Dumps the debug tables on match failure. -template <typename... T> testing::Matcher<StringRef> ranks(T... RankedStrings) { - return testing::MakeMatcher<StringRef>( +template <typename... T> +testing::Matcher<llvm::StringRef> ranks(T... RankedStrings) { + return testing::MakeMatcher<llvm::StringRef>( new RankMatcher{ExpectedMatch(RankedStrings)...}); } @@ -275,7 +279,7 @@ TEST(FuzzyMatch, Scoring) { // Returns pretty-printed segmentation of Text. // e.g. std::basic_string --> +-- +---- +----- -std::string segment(StringRef Text) { +std::string segment(llvm::StringRef Text) { std::vector<CharRole> Roles(Text.size()); calculateRoles(Text, Roles); std::string Printed; @@ -285,7 +289,7 @@ std::string segment(StringRef Text) { } // this is a no-op hack so clang-format will vertically align our testcases. -StringRef returns(StringRef Text) { return Text; } +llvm::StringRef returns(llvm::StringRef Text) { return Text; } TEST(FuzzyMatch, Segmentation) { EXPECT_THAT(segment("std::basic_string"), // diff --git a/clang-tools-extra/unittests/clangd/GlobalCompilationDatabaseTests.cpp b/clang-tools-extra/unittests/clangd/GlobalCompilationDatabaseTests.cpp index d5c0e6452b0..b0052c751c2 100644 --- a/clang-tools-extra/unittests/clangd/GlobalCompilationDatabaseTests.cpp +++ b/clang-tools-extra/unittests/clangd/GlobalCompilationDatabaseTests.cpp @@ -14,7 +14,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -36,15 +35,16 @@ TEST(GlobalCompilationDatabaseTest, FallbackCommand) { testPath("foo/bar.h"))); } -static tooling::CompileCommand cmd(StringRef File, StringRef Arg) { +static tooling::CompileCommand cmd(llvm::StringRef File, llvm::StringRef Arg) { return tooling::CompileCommand(testRoot(), File, {"clang", Arg, File}, ""); } class OverlayCDBTest : public ::testing::Test { class BaseCDB : public GlobalCompilationDatabase { public: - Optional<tooling::CompileCommand> - getCompileCommand(StringRef File, ProjectInfo *Project) const override { + llvm::Optional<tooling::CompileCommand> + getCompileCommand(llvm::StringRef File, + ProjectInfo *Project) const override { if (File == testPath("foo.cc")) { if (Project) Project->SourceRoot = testRoot(); @@ -53,7 +53,8 @@ class OverlayCDBTest : public ::testing::Test { return None; } - tooling::CompileCommand getFallbackCommand(StringRef File) const override { + tooling::CompileCommand + getFallbackCommand(llvm::StringRef File) const override { return cmd(File, "-DA=2"); } }; diff --git a/clang-tools-extra/unittests/clangd/HeadersTests.cpp b/clang-tools-extra/unittests/clangd/HeadersTests.cpp index bd28f714f73..79f0b9cb3f4 100644 --- a/clang-tools-extra/unittests/clangd/HeadersTests.cpp +++ b/clang-tools-extra/unittests/clangd/HeadersTests.cpp @@ -19,7 +19,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -53,7 +52,7 @@ private: CI->getDiagnosticOpts().IgnoreWarnings = true; auto Clang = prepareCompilerInstance( std::move(CI), /*Preamble=*/nullptr, - MemoryBuffer::getMemBuffer(FS.Files[MainFile], MainFile), + llvm::MemoryBuffer::getMemBuffer(FS.Files[MainFile], MainFile), std::make_shared<PCHContainerOperations>(), VFS, IgnoreDiags); EXPECT_FALSE(Clang->getFrontendOpts().Inputs.empty()); @@ -85,9 +84,9 @@ protected: if (Preferred.empty()) Preferred = Original; - auto ToHeaderFile = [](StringRef Header) { + auto ToHeaderFile = [](llvm::StringRef Header) { return HeaderFile{Header, - /*Verbatim=*/!sys::path::is_absolute(Header)}; + /*Verbatim=*/!llvm::sys::path::is_absolute(Header)}; }; IncludeInserter Inserter(MainFile, /*Code=*/"", format::getLLVMStyle(), @@ -104,7 +103,7 @@ protected: return Path; } - Optional<TextEdit> insert(StringRef VerbatimHeader) { + llvm::Optional<TextEdit> insert(llvm::StringRef VerbatimHeader) { auto Clang = setupClang(); PreprocessOnlyAction Action; EXPECT_TRUE( @@ -122,7 +121,7 @@ protected: MockCompilationDatabase CDB; std::string MainFile = testPath("main.cpp"); std::string Subdir = testPath("sub"); - std::string SearchDirArg = (Twine("-I") + Subdir).str(); + std::string SearchDirArg = (llvm::Twine("-I") + Subdir).str(); IgnoringDiagConsumer IgnoreDiags; }; diff --git a/clang-tools-extra/unittests/clangd/IndexActionTests.cpp b/clang-tools-extra/unittests/clangd/IndexActionTests.cpp index 93f324b7775..6a3da53a0fd 100644 --- a/clang-tools-extra/unittests/clangd/IndexActionTests.cpp +++ b/clang-tools-extra/unittests/clangd/IndexActionTests.cpp @@ -68,7 +68,7 @@ public: runIndexingAction(llvm::StringRef MainFilePath, const std::vector<std::string> &ExtraArgs = {}) { IndexFileIn IndexFile; - IntrusiveRefCntPtr<FileManager> Files( + llvm::IntrusiveRefCntPtr<FileManager> Files( new FileManager(FileSystemOptions(), InMemoryFileSystem)); auto Action = createStaticIndexingAction( @@ -101,7 +101,7 @@ public: protected: std::vector<std::string> FilePaths; - IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem; + llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem; }; TEST_F(IndexActionTest, CollectIncludeGraph) { diff --git a/clang-tools-extra/unittests/clangd/IndexTests.cpp b/clang-tools-extra/unittests/clangd/IndexTests.cpp index 82ef7ed5799..596366d5ba1 100644 --- a/clang-tools-extra/unittests/clangd/IndexTests.cpp +++ b/clang-tools-extra/unittests/clangd/IndexTests.cpp @@ -24,7 +24,6 @@ using testing::Pair; using testing::Pointee; using testing::UnorderedElementsAre; -using namespace llvm; namespace clang { namespace clangd { namespace { diff --git a/clang-tools-extra/unittests/clangd/JSONTransportTests.cpp b/clang-tools-extra/unittests/clangd/JSONTransportTests.cpp index 8f9d40bd475..f9afb4de251 100644 --- a/clang-tools-extra/unittests/clangd/JSONTransportTests.cpp +++ b/clang-tools-extra/unittests/clangd/JSONTransportTests.cpp @@ -12,7 +12,6 @@ #include "gtest/gtest.h" #include <stdio.h> -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -25,7 +24,7 @@ namespace { // Fixture takes care of managing the input/output buffers for the transport. class JSONTransportTest : public ::testing::Test { std::string InBuf, OutBuf, MirrorBuf; - raw_string_ostream Out, Mirror; + llvm::raw_string_ostream Out, Mirror; std::unique_ptr<FILE, int (*)(FILE *)> In; protected: @@ -52,40 +51,43 @@ protected: class Echo : public Transport::MessageHandler { Transport &Target; std::string LogBuf; - raw_string_ostream Log; + llvm::raw_string_ostream Log; public: Echo(Transport &Target) : Target(Target), Log(LogBuf) {} std::string log() { return Log.str(); } - bool onNotify(StringRef Method, json::Value Params) override { + bool onNotify(llvm::StringRef Method, llvm::json::Value Params) override { Log << "Notification " << Method << ": " << Params << "\n"; if (Method == "call") Target.call("echo call", std::move(Params), 42); return Method != "exit"; } - bool onCall(StringRef Method, json::Value Params, json::Value ID) override { + bool onCall(llvm::StringRef Method, llvm::json::Value Params, + llvm::json::Value ID) override { Log << "Call " << Method << "(" << ID << "): " << Params << "\n"; if (Method == "err") - Target.reply(ID, make_error<LSPError>("trouble at mill", ErrorCode(88))); + Target.reply( + ID, llvm::make_error<LSPError>("trouble at mill", ErrorCode(88))); else Target.reply(ID, std::move(Params)); return true; } - bool onReply(json::Value ID, Expected<json::Value> Params) override { + bool onReply(llvm::json::Value ID, + llvm::Expected<llvm::json::Value> Params) override { if (Params) Log << "Reply(" << ID << "): " << *Params << "\n"; else - Log << "Reply(" << ID << "): error = " << toString(Params.takeError()) - << "\n"; + Log << "Reply(" << ID + << "): error = " << llvm::toString(Params.takeError()) << "\n"; return true; } }; -std::string trim(StringRef S) { return S.trim().str(); } +std::string trim(llvm::StringRef S) { return S.trim().str(); } // Runs an Echo session using the standard JSON-RPC format we use in production. TEST_F(JSONTransportTest, StandardDense) { diff --git a/clang-tools-extra/unittests/clangd/QualityTests.cpp b/clang-tools-extra/unittests/clangd/QualityTests.cpp index 9673d0fb4fb..9175d6bc09e 100644 --- a/clang-tools-extra/unittests/clangd/QualityTests.cpp +++ b/clang-tools-extra/unittests/clangd/QualityTests.cpp @@ -30,7 +30,6 @@ #include "gtest/gtest.h" #include <vector> -using namespace llvm; namespace clang { namespace clangd { @@ -253,7 +252,7 @@ TEST(QualityTests, SymbolRelevanceSignalsSanity) { SymbolRelevanceSignals IndexProximate; IndexProximate.SymbolURI = "unittest:/foo/bar.h"; - StringMap<SourceParams> ProxSources; + llvm::StringMap<SourceParams> ProxSources; ProxSources.try_emplace(testPath("foo/baz.h")); URIDistance Distance(ProxSources); IndexProximate.FileProximityMatch = &Distance; diff --git a/clang-tools-extra/unittests/clangd/RIFFTests.cpp b/clang-tools-extra/unittests/clangd/RIFFTests.cpp index 6c5cebc7725..7ea1466ec88 100644 --- a/clang-tools-extra/unittests/clangd/RIFFTests.cpp +++ b/clang-tools-extra/unittests/clangd/RIFFTests.cpp @@ -11,7 +11,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -23,12 +22,12 @@ TEST(RIFFTest, File) { {riff::fourCC("even"), "abcd"}, {riff::fourCC("oddd"), "abcde"}, }}; - StringRef Serialized = StringRef("RIFF\x1e\0\0\0test" - "even\x04\0\0\0abcd" - "oddd\x05\0\0\0abcde\0", - 38); + llvm::StringRef Serialized = llvm::StringRef("RIFF\x1e\0\0\0test" + "even\x04\0\0\0abcd" + "oddd\x05\0\0\0abcde\0", + 38); - EXPECT_EQ(to_string(File), Serialized); + EXPECT_EQ(llvm::to_string(File), Serialized); auto Parsed = riff::readFile(Serialized); ASSERT_TRUE(bool(Parsed)) << Parsed.takeError(); EXPECT_EQ(*Parsed, File); diff --git a/clang-tools-extra/unittests/clangd/SerializationTests.cpp b/clang-tools-extra/unittests/clangd/SerializationTests.cpp index 9afc42e3c10..fe571c4a7e9 100644 --- a/clang-tools-extra/unittests/clangd/SerializationTests.cpp +++ b/clang-tools-extra/unittests/clangd/SerializationTests.cpp @@ -20,7 +20,6 @@ using testing::Pair; using testing::UnorderedElementsAre; using testing::UnorderedElementsAreArray; -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -158,7 +157,7 @@ TEST(SerializationTest, BinaryConversions) { // Write to binary format, and parse again. IndexFileOut Out(*In); Out.Format = IndexFileFormat::RIFF; - std::string Serialized = to_string(Out); + std::string Serialized = llvm::to_string(Out); auto In2 = readIndexFile(Serialized); ASSERT_TRUE(bool(In2)) << In.takeError(); @@ -191,7 +190,7 @@ TEST(SerializationTest, SrcsTest) { Out.Format = IndexFileFormat::RIFF; Out.Sources = &Sources; { - std::string Serialized = to_string(Out); + std::string Serialized = llvm::to_string(Out); auto In = readIndexFile(Serialized); ASSERT_TRUE(bool(In)) << In.takeError(); diff --git a/clang-tools-extra/unittests/clangd/SourceCodeTests.cpp b/clang-tools-extra/unittests/clangd/SourceCodeTests.cpp index 3148ccca923..b170c130d70 100644 --- a/clang-tools-extra/unittests/clangd/SourceCodeTests.cpp +++ b/clang-tools-extra/unittests/clangd/SourceCodeTests.cpp @@ -13,7 +13,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -54,63 +53,63 @@ TEST(SourceCodeTests, lspLength) { TEST(SourceCodeTests, PositionToOffset) { // line out of bounds - EXPECT_THAT_EXPECTED(positionToOffset(File, position(-1, 2)), Failed()); + EXPECT_THAT_EXPECTED(positionToOffset(File, position(-1, 2)), llvm::Failed()); // first line EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, -1)), - Failed()); // out of range + llvm::Failed()); // out of range EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 0)), - HasValue(0)); // first character + llvm::HasValue(0)); // first character EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 3)), - HasValue(3)); // middle character + llvm::HasValue(3)); // middle character EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 6)), - HasValue(6)); // last character + llvm::HasValue(6)); // last character EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 7)), - HasValue(7)); // the newline itself + llvm::HasValue(7)); // the newline itself EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 7), false), - HasValue(7)); + llvm::HasValue(7)); EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 8)), - HasValue(7)); // out of range + llvm::HasValue(7)); // out of range EXPECT_THAT_EXPECTED(positionToOffset(File, position(0, 8), false), - Failed()); // out of range + llvm::Failed()); // out of range // middle line EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, -1)), - Failed()); // out of range + llvm::Failed()); // out of range EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 0)), - HasValue(8)); // first character + llvm::HasValue(8)); // first character EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 3)), - HasValue(11)); // middle character + llvm::HasValue(11)); // middle character EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 3), false), - HasValue(11)); + llvm::HasValue(11)); EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 6)), - HasValue(16)); // last character + llvm::HasValue(16)); // last character EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 7)), - HasValue(17)); // the newline itself + llvm::HasValue(17)); // the newline itself EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 8)), - HasValue(17)); // out of range + llvm::HasValue(17)); // out of range EXPECT_THAT_EXPECTED(positionToOffset(File, position(1, 8), false), - Failed()); // out of range + llvm::Failed()); // out of range // last line EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, -1)), - Failed()); // out of range + llvm::Failed()); // out of range EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 0)), - HasValue(18)); // first character + llvm::HasValue(18)); // first character EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 3)), - HasValue(21)); // middle character + llvm::HasValue(21)); // middle character EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 5), false), - Failed()); // middle of surrogate pair + llvm::Failed()); // middle of surrogate pair EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 5)), - HasValue(26)); // middle of surrogate pair + llvm::HasValue(26)); // middle of surrogate pair EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 6), false), - HasValue(26)); // end of surrogate pair + llvm::HasValue(26)); // end of surrogate pair EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 8)), - HasValue(28)); // last character + llvm::HasValue(28)); // last character EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 9)), - HasValue(29)); // EOF + llvm::HasValue(29)); // EOF EXPECT_THAT_EXPECTED(positionToOffset(File, position(2, 10), false), - Failed()); // out of range + llvm::Failed()); // out of range // line out of bounds - EXPECT_THAT_EXPECTED(positionToOffset(File, position(3, 0)), Failed()); - EXPECT_THAT_EXPECTED(positionToOffset(File, position(3, 1)), Failed()); + EXPECT_THAT_EXPECTED(positionToOffset(File, position(3, 0)), llvm::Failed()); + EXPECT_THAT_EXPECTED(positionToOffset(File, position(3, 1)), llvm::Failed()); } TEST(SourceCodeTests, OffsetToPosition) { diff --git a/clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp b/clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp index 85ed45a7a2c..a1996fc75c7 100644 --- a/clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp +++ b/clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp @@ -27,7 +27,6 @@ #include <memory> #include <string> -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -103,7 +102,7 @@ HaveRanges(const std::vector<Range> Ranges) { class ShouldCollectSymbolTest : public ::testing::Test { public: - void build(StringRef HeaderCode, StringRef Code = "") { + void build(llvm::StringRef HeaderCode, llvm::StringRef Code = "") { File.HeaderFilename = HeaderName; File.Filename = FileName; File.HeaderCode = HeaderCode; @@ -112,7 +111,7 @@ public: } // build() must have been called. - bool shouldCollect(StringRef Name, bool Qualified = true) { + bool shouldCollect(llvm::StringRef Name, bool Qualified = true) { assert(AST.hasValue()); return SymbolCollector::shouldCollectSymbol( Qualified ? findDecl(*AST, Name) : findUnqualifiedDecl(*AST, Name), @@ -123,7 +122,7 @@ protected: std::string HeaderName = "f.h"; std::string FileName = "f.cpp"; TestTU File; - Optional<ParsedAST> AST; // Initialized after build. + llvm::Optional<ParsedAST> AST; // Initialized after build. }; TEST_F(ShouldCollectSymbolTest, ShouldCollectSymbol) { @@ -197,7 +196,7 @@ public: PragmaHandler(PragmaHandler) {} std::unique_ptr<ASTConsumer> - CreateASTConsumer(CompilerInstance &CI, StringRef InFile) override { + CreateASTConsumer(CompilerInstance &CI, llvm::StringRef InFile) override { if (PragmaHandler) CI.getPreprocessor().addCommentHandler(PragmaHandler); return WrapperFrontendAction::CreateASTConsumer(CI, InFile); @@ -224,16 +223,16 @@ public: class SymbolCollectorTest : public ::testing::Test { public: SymbolCollectorTest() - : InMemoryFileSystem(new vfs::InMemoryFileSystem), + : InMemoryFileSystem(new llvm::vfs::InMemoryFileSystem), TestHeaderName(testPath("symbol.h")), TestFileName(testPath("symbol.cc")) { TestHeaderURI = URI::create(TestHeaderName).toString(); TestFileURI = URI::create(TestFileName).toString(); } - bool runSymbolCollector(StringRef HeaderCode, StringRef MainCode, + bool runSymbolCollector(llvm::StringRef HeaderCode, llvm::StringRef MainCode, const std::vector<std::string> &ExtraArgs = {}) { - IntrusiveRefCntPtr<FileManager> Files( + llvm::IntrusiveRefCntPtr<FileManager> Files( new FileManager(FileSystemOptions(), InMemoryFileSystem)); auto Factory = llvm::make_unique<SymbolIndexActionFactory>( @@ -252,9 +251,9 @@ public: std::make_shared<PCHContainerOperations>()); InMemoryFileSystem->addFile(TestHeaderName, 0, - MemoryBuffer::getMemBuffer(HeaderCode)); + llvm::MemoryBuffer::getMemBuffer(HeaderCode)); InMemoryFileSystem->addFile(TestFileName, 0, - MemoryBuffer::getMemBuffer(MainCode)); + llvm::MemoryBuffer::getMemBuffer(MainCode)); Invocation.run(); Symbols = Factory->Collector->takeSymbols(); Refs = Factory->Collector->takeRefs(); @@ -262,7 +261,7 @@ public: } protected: - IntrusiveRefCntPtr<vfs::InMemoryFileSystem> InMemoryFileSystem; + llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem; std::string TestHeaderName; std::string TestHeaderURI; std::string TestFileName; @@ -829,7 +828,7 @@ TEST_F(SymbolCollectorTest, SkipIncFileWhenCanonicalizeHeaders) { auto IncFile = testPath("test.inc"); auto IncURI = URI::create(IncFile).toString(); InMemoryFileSystem->addFile(IncFile, 0, - MemoryBuffer::getMemBuffer("class X {};")); + llvm::MemoryBuffer::getMemBuffer("class X {};")); runSymbolCollector("#include \"test.inc\"\nclass Y {};", /*Main=*/"", /*ExtraArgs=*/{"-I", testRoot()}); EXPECT_THAT(Symbols, @@ -848,7 +847,7 @@ TEST_F(SymbolCollectorTest, MainFileIsHeaderWhenSkipIncFile) { auto IncFile = testPath("test.inc"); auto IncURI = URI::create(IncFile).toString(); InMemoryFileSystem->addFile(IncFile, 0, - MemoryBuffer::getMemBuffer("class X {};")); + llvm::MemoryBuffer::getMemBuffer("class X {};")); runSymbolCollector("", /*Main=*/"#include \"test.inc\"", /*ExtraArgs=*/{"-I", testRoot()}); EXPECT_THAT(Symbols, UnorderedElementsAre(AllOf(QName("X"), DeclURI(IncURI), @@ -864,7 +863,7 @@ TEST_F(SymbolCollectorTest, MainFileIsHeaderWithoutExtensionWhenSkipIncFile) { auto IncFile = testPath("test.inc"); auto IncURI = URI::create(IncFile).toString(); InMemoryFileSystem->addFile(IncFile, 0, - MemoryBuffer::getMemBuffer("class X {};")); + llvm::MemoryBuffer::getMemBuffer("class X {};")); runSymbolCollector("", /*Main=*/"#include \"test.inc\"", /*ExtraArgs=*/{"-I", testRoot()}); EXPECT_THAT(Symbols, UnorderedElementsAre(AllOf(QName("X"), DeclURI(IncURI), @@ -878,7 +877,7 @@ TEST_F(SymbolCollectorTest, FallbackToIncFileWhenIncludingFileIsCC) { auto IncFile = testPath("test.inc"); auto IncURI = URI::create(IncFile).toString(); InMemoryFileSystem->addFile(IncFile, 0, - MemoryBuffer::getMemBuffer("class X {};")); + llvm::MemoryBuffer::getMemBuffer("class X {};")); runSymbolCollector("", /*Main=*/"#include \"test.inc\"", /*ExtraArgs=*/{"-I", testRoot()}); EXPECT_THAT(Symbols, UnorderedElementsAre(AllOf(QName("X"), DeclURI(IncURI), diff --git a/clang-tools-extra/unittests/clangd/SymbolInfoTests.cpp b/clang-tools-extra/unittests/clangd/SymbolInfoTests.cpp index f5cca62dbc5..cbd178e6853 100644 --- a/clang-tools-extra/unittests/clangd/SymbolInfoTests.cpp +++ b/clang-tools-extra/unittests/clangd/SymbolInfoTests.cpp @@ -21,7 +21,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { diff --git a/clang-tools-extra/unittests/clangd/SyncAPI.cpp b/clang-tools-extra/unittests/clangd/SyncAPI.cpp index 8591f624d2e..83e6b761b75 100644 --- a/clang-tools-extra/unittests/clangd/SyncAPI.cpp +++ b/clang-tools-extra/unittests/clangd/SyncAPI.cpp @@ -10,12 +10,11 @@ #include "SyncAPI.h" #include "index/Index.h" -using namespace llvm; namespace clang { namespace clangd { -void runAddDocument(ClangdServer &Server, PathRef File, StringRef Contents, - WantDiagnostics WantDiags) { +void runAddDocument(ClangdServer &Server, PathRef File, + llvm::StringRef Contents, WantDiagnostics WantDiags) { Server.addDocument(File, Contents, WantDiags); if (!Server.blockUntilIdleForTest()) llvm_unreachable("not idle after addDocument"); @@ -27,7 +26,7 @@ namespace { /// T Result; /// someAsyncFunc(Param1, Param2, /*Callback=*/capture(Result)); template <typename T> struct CaptureProxy { - CaptureProxy(Optional<T> &Target) : Target(&Target) { + CaptureProxy(llvm::Optional<T> &Target) : Target(&Target) { assert(!Target.hasValue()); } @@ -39,7 +38,7 @@ template <typename T> struct CaptureProxy { } CaptureProxy &operator=(CaptureProxy &&) = delete; - operator unique_function<void(T)>() && { + operator llvm::unique_function<void(T)>() && { assert(!Future.valid() && "conversion to callback called multiple times"); Future = Promise.get_future(); return Bind( @@ -58,7 +57,7 @@ template <typename T> struct CaptureProxy { } private: - Optional<T> *Target; + llvm::Optional<T> *Target; // Using shared_ptr to workaround compilation errors with MSVC. // MSVC only allows default-construcitble and copyable objects as future<> // arguments. @@ -66,68 +65,69 @@ private: std::future<std::shared_ptr<T>> Future; }; -template <typename T> CaptureProxy<T> capture(Optional<T> &Target) { +template <typename T> CaptureProxy<T> capture(llvm::Optional<T> &Target) { return CaptureProxy<T>(Target); } } // namespace -Expected<CodeCompleteResult> runCodeComplete(ClangdServer &Server, PathRef File, - Position Pos, - clangd::CodeCompleteOptions Opts) { - Optional<Expected<CodeCompleteResult>> Result; +llvm::Expected<CodeCompleteResult> +runCodeComplete(ClangdServer &Server, PathRef File, Position Pos, + clangd::CodeCompleteOptions Opts) { + llvm::Optional<llvm::Expected<CodeCompleteResult>> Result; Server.codeComplete(File, Pos, Opts, capture(Result)); return std::move(*Result); } -Expected<SignatureHelp> runSignatureHelp(ClangdServer &Server, PathRef File, - Position Pos) { - Optional<Expected<SignatureHelp>> Result; +llvm::Expected<SignatureHelp> runSignatureHelp(ClangdServer &Server, + PathRef File, Position Pos) { + llvm::Optional<llvm::Expected<SignatureHelp>> Result; Server.signatureHelp(File, Pos, capture(Result)); return std::move(*Result); } -Expected<std::vector<Location>> runFindDefinitions(ClangdServer &Server, - PathRef File, Position Pos) { - Optional<Expected<std::vector<Location>>> Result; +llvm::Expected<std::vector<Location>> +runFindDefinitions(ClangdServer &Server, PathRef File, Position Pos) { + llvm::Optional<llvm::Expected<std::vector<Location>>> Result; Server.findDefinitions(File, Pos, capture(Result)); return std::move(*Result); } -Expected<std::vector<DocumentHighlight>> +llvm::Expected<std::vector<DocumentHighlight>> runFindDocumentHighlights(ClangdServer &Server, PathRef File, Position Pos) { - Optional<Expected<std::vector<DocumentHighlight>>> Result; + llvm::Optional<llvm::Expected<std::vector<DocumentHighlight>>> Result; Server.findDocumentHighlights(File, Pos, capture(Result)); return std::move(*Result); } -Expected<std::vector<tooling::Replacement>> -runRename(ClangdServer &Server, PathRef File, Position Pos, StringRef NewName) { - Optional<Expected<std::vector<tooling::Replacement>>> Result; +llvm::Expected<std::vector<tooling::Replacement>> +runRename(ClangdServer &Server, PathRef File, Position Pos, + llvm::StringRef NewName) { + llvm::Optional<llvm::Expected<std::vector<tooling::Replacement>>> Result; Server.rename(File, Pos, NewName, capture(Result)); return std::move(*Result); } std::string runDumpAST(ClangdServer &Server, PathRef File) { - Optional<std::string> Result; + llvm::Optional<std::string> Result; Server.dumpAST(File, capture(Result)); return std::move(*Result); } -Expected<std::vector<SymbolInformation>> -runWorkspaceSymbols(ClangdServer &Server, StringRef Query, int Limit) { - Optional<Expected<std::vector<SymbolInformation>>> Result; +llvm::Expected<std::vector<SymbolInformation>> +runWorkspaceSymbols(ClangdServer &Server, llvm::StringRef Query, int Limit) { + llvm::Optional<llvm::Expected<std::vector<SymbolInformation>>> Result; Server.workspaceSymbols(Query, Limit, capture(Result)); return std::move(*Result); } -Expected<std::vector<DocumentSymbol>> runDocumentSymbols(ClangdServer &Server, - PathRef File) { - Optional<Expected<std::vector<DocumentSymbol>>> Result; +llvm::Expected<std::vector<DocumentSymbol>> +runDocumentSymbols(ClangdServer &Server, PathRef File) { + llvm::Optional<llvm::Expected<std::vector<DocumentSymbol>>> Result; Server.documentSymbols(File, capture(Result)); return std::move(*Result); } -SymbolSlab runFuzzyFind(const SymbolIndex &Index, StringRef Query) { +SymbolSlab runFuzzyFind(const SymbolIndex &Index, llvm::StringRef Query) { FuzzyFindRequest Req; Req.Query = Query; Req.AnyScope = true; diff --git a/clang-tools-extra/unittests/clangd/TUSchedulerTests.cpp b/clang-tools-extra/unittests/clangd/TUSchedulerTests.cpp index c0442708210..27cc637551c 100644 --- a/clang-tools-extra/unittests/clangd/TUSchedulerTests.cpp +++ b/clang-tools-extra/unittests/clangd/TUSchedulerTests.cpp @@ -18,7 +18,6 @@ #include <algorithm> #include <utility> -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -43,8 +42,8 @@ protected: buildTestFS(Files, Timestamps), std::move(Contents)}; } - void updateWithCallback(TUScheduler &S, PathRef File, StringRef Contents, - WantDiagnostics WD, + void updateWithCallback(TUScheduler &S, PathRef File, + llvm::StringRef Contents, WantDiagnostics WD, llvm::unique_function<void()> CB) { WithContextValue Ctx(llvm::make_scope_exit(std::move(CB))); S.update(File, getInputs(File, Contents), WD); @@ -93,8 +92,8 @@ protected: std::move(CB)); } - StringMap<std::string> Files; - StringMap<time_t> Timestamps; + llvm::StringMap<std::string> Files; + llvm::StringMap<time_t> Timestamps; MockCompilationDatabase CDB; }; diff --git a/clang-tools-extra/unittests/clangd/TestFS.cpp b/clang-tools-extra/unittests/clangd/TestFS.cpp index 1c845b99ad6..082f15a1afa 100644 --- a/clang-tools-extra/unittests/clangd/TestFS.cpp +++ b/clang-tools-extra/unittests/clangd/TestFS.cpp @@ -14,37 +14,36 @@ namespace clang { namespace clangd { -using namespace llvm; -IntrusiveRefCntPtr<vfs::FileSystem> -buildTestFS(StringMap<std::string> const &Files, - StringMap<time_t> const &Timestamps) { - IntrusiveRefCntPtr<vfs::InMemoryFileSystem> MemFS( - new vfs::InMemoryFileSystem); +llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> +buildTestFS(llvm::StringMap<std::string> const &Files, + llvm::StringMap<time_t> const &Timestamps) { + llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> MemFS( + new llvm::vfs::InMemoryFileSystem); MemFS->setCurrentWorkingDirectory(testRoot()); for (auto &FileAndContents : Files) { - StringRef File = FileAndContents.first(); + llvm::StringRef File = FileAndContents.first(); MemFS->addFile( File, Timestamps.lookup(File), - MemoryBuffer::getMemBufferCopy(FileAndContents.second, File)); + llvm::MemoryBuffer::getMemBufferCopy(FileAndContents.second, File)); } return MemFS; } -MockCompilationDatabase::MockCompilationDatabase(StringRef Directory, - StringRef RelPathPrefix) +MockCompilationDatabase::MockCompilationDatabase(llvm::StringRef Directory, + llvm::StringRef RelPathPrefix) : ExtraClangFlags({"-ffreestanding"}), Directory(Directory), RelPathPrefix(RelPathPrefix) { // -ffreestanding avoids implicit stdc-predef.h. } -Optional<tooling::CompileCommand> +llvm::Optional<tooling::CompileCommand> MockCompilationDatabase::getCompileCommand(PathRef File, ProjectInfo *Project) const { if (ExtraClangFlags.empty()) return None; - auto FileName = sys::path::filename(File); + auto FileName = llvm::sys::path::filename(File); // Build the compile command. auto CommandLine = ExtraClangFlags; @@ -54,16 +53,17 @@ MockCompilationDatabase::getCompileCommand(PathRef File, CommandLine.push_back(File); } else { // Build a relative path using RelPathPrefix. - SmallString<32> RelativeFilePath(RelPathPrefix); - sys::path::append(RelativeFilePath, FileName); + llvm::SmallString<32> RelativeFilePath(RelPathPrefix); + llvm::sys::path::append(RelativeFilePath, FileName); CommandLine.push_back(RelativeFilePath.str()); } if (Project) Project->SourceRoot = Directory; - return {tooling::CompileCommand( - Directory != StringRef() ? Directory : sys::path::parent_path(File), - FileName, std::move(CommandLine), "")}; + return {tooling::CompileCommand(Directory != llvm::StringRef() + ? Directory + : llvm::sys::path::parent_path(File), + FileName, std::move(CommandLine), "")}; } const char *testRoot() { @@ -75,12 +75,12 @@ const char *testRoot() { } std::string testPath(PathRef File) { - assert(sys::path::is_relative(File) && "FileName should be relative"); + assert(llvm::sys::path::is_relative(File) && "FileName should be relative"); - SmallString<32> NativeFile = File; - sys::path::native(NativeFile); - SmallString<32> Path; - sys::path::append(Path, testRoot(), NativeFile); + llvm::SmallString<32> NativeFile = File; + llvm::sys::path::native(NativeFile); + llvm::SmallString<32> Path; + llvm::sys::path::append(Path, testRoot(), NativeFile); return Path.str(); } @@ -91,29 +91,32 @@ class TestScheme : public URIScheme { public: static const char *Scheme; - Expected<std::string> getAbsolutePath(StringRef /*Authority*/, StringRef Body, - StringRef HintPath) const override { + llvm::Expected<std::string> + getAbsolutePath(llvm::StringRef /*Authority*/, llvm::StringRef Body, + llvm::StringRef HintPath) const override { if (!HintPath.startswith(testRoot())) - return make_error<StringError>( + return llvm::make_error<llvm::StringError>( "Hint path doesn't start with test root: " + HintPath, - inconvertibleErrorCode()); + llvm::inconvertibleErrorCode()); if (!Body.consume_front("/")) - return make_error<StringError>( + return llvm::make_error<llvm::StringError>( "Body of an unittest: URI must start with '/'", - inconvertibleErrorCode()); - SmallString<16> Path(Body.begin(), Body.end()); - sys::path::native(Path); + llvm::inconvertibleErrorCode()); + llvm::SmallString<16> Path(Body.begin(), Body.end()); + llvm::sys::path::native(Path); return testPath(Path); } - Expected<URI> uriFromAbsolutePath(StringRef AbsolutePath) const override { - StringRef Body = AbsolutePath; + llvm::Expected<URI> + uriFromAbsolutePath(llvm::StringRef AbsolutePath) const override { + llvm::StringRef Body = AbsolutePath; if (!Body.consume_front(testRoot())) - return make_error<StringError>(AbsolutePath + "does not start with " + - testRoot(), - inconvertibleErrorCode()); + return llvm::make_error<llvm::StringError>( + AbsolutePath + "does not start with " + testRoot(), + llvm::inconvertibleErrorCode()); - return URI(Scheme, /*Authority=*/"", sys::path::convert_to_slash(Body)); + return URI(Scheme, /*Authority=*/"", + llvm::sys::path::convert_to_slash(Body)); } }; diff --git a/clang-tools-extra/unittests/clangd/TestIndex.cpp b/clang-tools-extra/unittests/clangd/TestIndex.cpp index 2043f61e752..714d3a6842c 100644 --- a/clang-tools-extra/unittests/clangd/TestIndex.cpp +++ b/clang-tools-extra/unittests/clangd/TestIndex.cpp @@ -9,15 +9,14 @@ #include "TestIndex.h" -using namespace llvm; namespace clang { namespace clangd { -Symbol symbol(StringRef QName) { +Symbol symbol(llvm::StringRef QName) { Symbol Sym; Sym.ID = SymbolID(QName.str()); size_t Pos = QName.rfind("::"); - if (Pos == StringRef::npos) { + if (Pos == llvm::StringRef::npos) { Sym.Name = QName; Sym.Scope = ""; } else { @@ -29,7 +28,7 @@ Symbol symbol(StringRef QName) { SymbolSlab generateSymbols(std::vector<std::string> QualifiedNames) { SymbolSlab::Builder Slab; - for (StringRef QName : QualifiedNames) + for (llvm::StringRef QName : QualifiedNames) Slab.insert(symbol(QName)); return std::move(Slab).build(); } @@ -57,7 +56,8 @@ std::vector<std::string> match(const SymbolIndex &I, } // Returns qualified names of symbols with any of IDs in the index. -std::vector<std::string> lookup(const SymbolIndex &I, ArrayRef<SymbolID> IDs) { +std::vector<std::string> lookup(const SymbolIndex &I, + llvm::ArrayRef<SymbolID> IDs) { LookupRequest Req; Req.IDs.insert(IDs.begin(), IDs.end()); std::vector<std::string> Results; diff --git a/clang-tools-extra/unittests/clangd/TestTU.cpp b/clang-tools-extra/unittests/clangd/TestTU.cpp index 4e14262e727..6706c44927d 100644 --- a/clang-tools-extra/unittests/clangd/TestTU.cpp +++ b/clang-tools-extra/unittests/clangd/TestTU.cpp @@ -16,7 +16,6 @@ #include "clang/Frontend/PCHContainerOperations.h" #include "clang/Frontend/Utils.h" -using namespace llvm; namespace clang { namespace clangd { @@ -67,7 +66,7 @@ std::unique_ptr<SymbolIndex> TestTU::index() const { return std::move(Idx); } -const Symbol &findSymbol(const SymbolSlab &Slab, StringRef QName) { +const Symbol &findSymbol(const SymbolSlab &Slab, llvm::StringRef QName) { const Symbol *Result = nullptr; for (const Symbol &S : Slab) { if (QName != (S.Scope + S.Name).str()) @@ -88,13 +87,13 @@ const Symbol &findSymbol(const SymbolSlab &Slab, StringRef QName) { return *Result; } -const NamedDecl &findDecl(ParsedAST &AST, StringRef QName) { - SmallVector<StringRef, 4> Components; +const NamedDecl &findDecl(ParsedAST &AST, llvm::StringRef QName) { + llvm::SmallVector<llvm::StringRef, 4> Components; QName.split(Components, "::"); auto &Ctx = AST.getASTContext(); auto LookupDecl = [&Ctx](const DeclContext &Scope, - StringRef Name) -> const NamedDecl & { + llvm::StringRef Name) -> const NamedDecl & { auto LookupRes = Scope.lookup(DeclarationName(&Ctx.Idents.get(Name))); assert(!LookupRes.empty() && "Lookup failed"); assert(LookupRes.size() == 1 && "Lookup returned multiple results"); @@ -113,7 +112,7 @@ const NamedDecl &findDecl(ParsedAST &AST, std::function<bool(const NamedDecl &)> Filter) { struct Visitor : RecursiveASTVisitor<Visitor> { decltype(Filter) F; - SmallVector<const NamedDecl *, 1> Decls; + llvm::SmallVector<const NamedDecl *, 1> Decls; bool VisitNamedDecl(const NamedDecl *ND) { if (F(*ND)) Decls.push_back(ND); @@ -129,7 +128,7 @@ const NamedDecl &findDecl(ParsedAST &AST, return *Visitor.Decls.front(); } -const NamedDecl &findUnqualifiedDecl(ParsedAST &AST, StringRef Name) { +const NamedDecl &findUnqualifiedDecl(ParsedAST &AST, llvm::StringRef Name) { return findDecl(AST, [Name](const NamedDecl &ND) { if (auto *ID = ND.getIdentifier()) if (ID->getName() == Name) diff --git a/clang-tools-extra/unittests/clangd/TraceTests.cpp b/clang-tools-extra/unittests/clangd/TraceTests.cpp index 0a2697ff3a9..98115651f06 100644 --- a/clang-tools-extra/unittests/clangd/TraceTests.cpp +++ b/clang-tools-extra/unittests/clangd/TraceTests.cpp @@ -17,32 +17,32 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { MATCHER_P(StringNode, Val, "") { - if (arg->getType() != yaml::Node::NK_Scalar) { + if (arg->getType() != llvm::yaml::Node::NK_Scalar) { *result_listener << "is a " << arg->getVerbatimTag(); return false; } - SmallString<32> S; - return Val == static_cast<yaml::ScalarNode *>(arg)->getValue(S); + llvm::SmallString<32> S; + return Val == static_cast<llvm::yaml::ScalarNode *>(arg)->getValue(S); } // Checks that N is a Mapping (JS object) with the expected scalar properties. // The object must have all the Expected properties, but may have others. -bool VerifyObject(yaml::Node &N, std::map<std::string, std::string> Expected) { - auto *M = dyn_cast<yaml::MappingNode>(&N); +bool VerifyObject(llvm::yaml::Node &N, + std::map<std::string, std::string> Expected) { + auto *M = llvm::dyn_cast<llvm::yaml::MappingNode>(&N); if (!M) { ADD_FAILURE() << "Not an object"; return false; } bool Match = true; - SmallString<32> Tmp; + llvm::SmallString<32> Tmp; for (auto &Prop : *M) { - auto *K = dyn_cast_or_null<yaml::ScalarNode>(Prop.getKey()); + auto *K = llvm::dyn_cast_or_null<llvm::yaml::ScalarNode>(Prop.getKey()); if (!K) continue; std::string KS = K->getValue(Tmp).str(); @@ -50,7 +50,7 @@ bool VerifyObject(yaml::Node &N, std::map<std::string, std::string> Expected) { if (I == Expected.end()) continue; // Ignore properties with no assertion. - auto *V = dyn_cast_or_null<yaml::ScalarNode>(Prop.getValue()); + auto *V = llvm::dyn_cast_or_null<llvm::yaml::ScalarNode>(Prop.getValue()); if (!V) { ADD_FAILURE() << KS << " is not a string"; Match = false; @@ -73,7 +73,7 @@ TEST(TraceTest, SmokeTest) { // Capture some events. std::string JSON; { - raw_string_ostream OS(JSON); + llvm::raw_string_ostream OS(JSON); auto JSONTracer = trace::createJSONTracer(OS); trace::Session Session(*JSONTracer); { @@ -83,15 +83,15 @@ TEST(TraceTest, SmokeTest) { } // Get the root JSON object using the YAML parser. - SourceMgr SM; - yaml::Stream Stream(JSON, SM); + llvm::SourceMgr SM; + llvm::yaml::Stream Stream(JSON, SM); auto Doc = Stream.begin(); ASSERT_NE(Doc, Stream.end()); - auto *Root = dyn_cast_or_null<yaml::MappingNode>(Doc->getRoot()); + auto *Root = llvm::dyn_cast_or_null<llvm::yaml::MappingNode>(Doc->getRoot()); ASSERT_NE(Root, nullptr) << "Root should be an object"; // Check whether we expect thread name events on this platform. - SmallString<32> ThreadName; + llvm::SmallString<32> ThreadName; get_thread_name(ThreadName); bool ThreadsHaveNames = !ThreadName.empty(); @@ -105,7 +105,8 @@ TEST(TraceTest, SmokeTest) { EXPECT_THAT(Prop->getValue(), StringNode("ns")); ASSERT_NE(++Prop, Root->end()) << "Expected traceEvents property"; EXPECT_THAT(Prop->getKey(), StringNode("traceEvents")); - auto *Events = dyn_cast_or_null<yaml::SequenceNode>(Prop->getValue()); + auto *Events = + llvm::dyn_cast_or_null<llvm::yaml::SequenceNode>(Prop->getValue()); ASSERT_NE(Events, nullptr) << "traceEvents should be an array"; auto Event = Events->begin(); ASSERT_NE(Event, Events->end()) << "Expected process name"; diff --git a/clang-tools-extra/unittests/clangd/URITests.cpp b/clang-tools-extra/unittests/clangd/URITests.cpp index 302affd2f54..ae84d56e37a 100644 --- a/clang-tools-extra/unittests/clangd/URITests.cpp +++ b/clang-tools-extra/unittests/clangd/URITests.cpp @@ -13,7 +13,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { @@ -29,14 +28,15 @@ MATCHER_P(Scheme, S, "") { return arg.scheme() == S; } MATCHER_P(Authority, A, "") { return arg.authority() == A; } MATCHER_P(Body, B, "") { return arg.body() == B; } -std::string createOrDie(StringRef AbsolutePath, StringRef Scheme = "file") { +std::string createOrDie(llvm::StringRef AbsolutePath, + llvm::StringRef Scheme = "file") { auto Uri = URI::create(AbsolutePath, Scheme); if (!Uri) llvm_unreachable(toString(Uri.takeError()).c_str()); return Uri->toString(); } -URI parseOrDie(StringRef Uri) { +URI parseOrDie(llvm::StringRef Uri) { auto U = URI::parse(Uri); if (!U) llvm_unreachable(toString(U.takeError()).c_str()); @@ -61,7 +61,7 @@ TEST(PercentEncodingTest, Decode) { EXPECT_EQ(parseOrDie("x:a:b%3bc").body(), "a:b;c"); } -std::string resolveOrDie(const URI &U, StringRef HintPath = "") { +std::string resolveOrDie(const URI &U, llvm::StringRef HintPath = "") { auto Path = URI::resolve(U, HintPath); if (!Path) llvm_unreachable(toString(Path.takeError()).c_str()); @@ -137,7 +137,8 @@ TEST(URITest, Resolve) { testPath("a")); } -std::string resolvePathOrDie(StringRef AbsPath, StringRef HintPath = "") { +std::string resolvePathOrDie(llvm::StringRef AbsPath, + llvm::StringRef HintPath = "") { auto Path = URI::resolvePath(AbsPath, HintPath); if (!Path) llvm_unreachable(toString(Path.takeError()).c_str()); diff --git a/clang-tools-extra/unittests/clangd/XRefsTests.cpp b/clang-tools-extra/unittests/clangd/XRefsTests.cpp index 04ceda916aa..123049cf116 100644 --- a/clang-tools-extra/unittests/clangd/XRefsTests.cpp +++ b/clang-tools-extra/unittests/clangd/XRefsTests.cpp @@ -21,7 +21,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace llvm; namespace clang { namespace clangd { namespace { @@ -379,7 +378,7 @@ int [[bar_not_preamble]]; // Make the compilation paths appear as ../src/foo.cpp in the compile // commands. SmallString<32> RelPathPrefix(".."); - sys::path::append(RelPathPrefix, "src"); + llvm::sys::path::append(RelPathPrefix, "src"); std::string BuildDir = testPath("build"); MockCompilationDatabase CDB(BuildDir, RelPathPrefix); @@ -1305,9 +1304,9 @@ TEST(FindReferences, NeedsIndex) { TEST(FindReferences, NoQueryForLocalSymbols) { struct RecordingIndex : public MemIndex { - mutable Optional<DenseSet<SymbolID>> RefIDs; + mutable Optional<llvm::DenseSet<SymbolID>> RefIDs; void refs(const RefsRequest &Req, - function_ref<void(const Ref &)>) const override { + llvm::function_ref<void(const Ref &)>) const override { RefIDs = Req.IDs; } }; |
