Author: ioeric Date: Thu Feb 1 04:44:52 2018 New Revision: 323957 URL: http://llvm.org/viewvc/llvm-project?rev=323957&view=rev Log: [clangd] Fix URI scheme conflict and an unused variable warning in tests. NFC
Modified: clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp clang-tools-extra/trunk/unittests/clangd/URITests.cpp Modified: clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp?rev=323957&r1=323956&r2=323957&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp (original) +++ clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp Thu Feb 1 04:44:52 2018 @@ -44,7 +44,8 @@ public: llvm::SmallVector<char, 16> Path(Body.begin(), Body.end()); path::native(Path); auto Err = fs::make_absolute(TestDir, Path); - assert(!Err); + if (Err) + llvm_unreachable("Failed to make absolute path in test scheme."); return std::string(Path.begin(), Path.end()); } Modified: clang-tools-extra/trunk/unittests/clangd/URITests.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clangd/URITests.cpp?rev=323957&r1=323956&r2=323957&view=diff ============================================================================== --- clang-tools-extra/trunk/unittests/clangd/URITests.cpp (original) +++ clang-tools-extra/trunk/unittests/clangd/URITests.cpp Thu Feb 1 04:44:52 2018 @@ -49,7 +49,7 @@ public: } }; -const char *TestScheme::Scheme = "test"; +const char *TestScheme::Scheme = "unittest"; const char *TestScheme::TestRoot = "/test-root/"; static URISchemeRegistry::Add<TestScheme> X(TestScheme::Scheme, "Test schema"); @@ -166,7 +166,7 @@ TEST(URITest, Resolve) { #else EXPECT_EQ(resolveOrDie(parseOrDie("file:/a/b/c")), "/a/b/c"); EXPECT_EQ(resolveOrDie(parseOrDie("file://auth/a/b/c")), "/a/b/c"); - EXPECT_EQ(resolveOrDie(parseOrDie("test:a/b/c"), "/dir/test-root/x/y/z"), + EXPECT_EQ(resolveOrDie(parseOrDie("unittest:a/b/c"), "/dir/test-root/x/y/z"), "/dir/test-root/a/b/c"); EXPECT_THAT(resolveOrDie(parseOrDie("file://au%3dth/%28x%29/y/%20z")), "/(x)/y/ z"); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits