maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clangd] Fix URI scheme conflict and an unused variable warning in tests. NFC 

llvm-svn: 323957
This commit is contained in:
Eric Liu 2018-02-01 12:44:52 +00:00
parent 4e9a1264dd
commit cda2526d86
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang-tools-extra/clangd/ClangdLSPServer.cpp
View File

@ -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());
}

4
clang-tools-extra/unittests/clangd/URITests.cpp
View File

@ -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");