[clangd] Remove ./ and ../ in the file paths

kadircet · kadircet · commit 890dfddef0f9 · 2019-03-08T09:57:33.000Z
Reviewers: hokein Subscribers: ilya-biryukov, ioeric, MaskRay, jkorous, arphaman, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D59084 llvm-svn: 355681
diff --git a/clang-tools-extra/clangd/index/Background.cpp b/clang-tools-extra/clangd/index/Background.cpp
@@ -121,6 +121,7 @@ llvm::SmallString<128> getAbsolutePath(const tooling::CompileCommand &Cmd) {
   } else {
     AbsolutePath = Cmd.Directory;
     llvm::sys::path::append(AbsolutePath, Cmd.Filename);
+    llvm::sys::path::remove_dots(AbsolutePath, true);
   }
   return AbsolutePath;
 }
diff --git a/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp b/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp
@@ -44,12 +44,14 @@ class MemoryShardStorage : public BackgroundIndexStorage {
   llvm::Error storeShard(llvm::StringRef ShardIdentifier,
                          IndexFileOut Shard) const override {
     std::lock_guard<std::mutex> Lock(StorageMu);
+    AccessedPaths.insert(ShardIdentifier);
     Storage[ShardIdentifier] = llvm::to_string(Shard);
     return llvm::Error::success();
   }
   std::unique_ptr<IndexFileIn>
   loadShard(llvm::StringRef ShardIdentifier) const override {
     std::lock_guard<std::mutex> Lock(StorageMu);
+    AccessedPaths.insert(ShardIdentifier);
     if (Storage.find(ShardIdentifier) == Storage.end()) {
       return nullptr;
     }
@@ -62,6 +64,8 @@ class MemoryShardStorage : public BackgroundIndexStorage {
     CacheHits++;
     return llvm::make_unique<IndexFileIn>(std::move(*IndexFile));
   }
+
+  mutable llvm::StringSet<> AccessedPaths;
 };
 
 class BackgroundIndexTest : public ::testing::Test {
@@ -428,5 +432,34 @@ TEST_F(BackgroundIndexTest, ShardStorageEmptyFile) {
               Contains(AllOf(Named("new_func"), Declared(), Not(Defined()))));
 }
 
+TEST_F(BackgroundIndexTest, NoDotsInAbsPath) {
+  MockFSProvider FS;
+  llvm::StringMap<std::string> Storage;
+  size_t CacheHits = 0;
+  MemoryShardStorage MSS(Storage, CacheHits);
+  OverlayCDB CDB(/*Base=*/nullptr);
+  BackgroundIndex Idx(Context::empty(), FS, CDB,
+                      [&](llvm::StringRef) { return &MSS; });
+
+  tooling::CompileCommand Cmd;
+  FS.Files[testPath("root/A.cc")] = "";
+  Cmd.Filename = "../A.cc";
+  Cmd.Directory = testPath("root/build");
+  Cmd.CommandLine = {"clang++", "../A.cc"};
+  CDB.setCompileCommand(testPath("root/build/../A.cc"), Cmd);
+
+  FS.Files[testPath("root/B.cc")] = "";
+  Cmd.Filename = "./B.cc";
+  Cmd.Directory = testPath("root");
+  Cmd.CommandLine = {"clang++", "./B.cc"};
+  CDB.setCompileCommand(testPath("root/./B.cc"), Cmd);
+
+  ASSERT_TRUE(Idx.blockUntilIdleForTest());
+  for (llvm::StringRef AbsPath : MSS.AccessedPaths.keys()) {
+    EXPECT_FALSE(AbsPath.contains("./")) << AbsPath;
+    EXPECT_FALSE(AbsPath.contains("../")) << AbsPath;
+  }
+}
+
 } // namespace clangd
 } // namespace clang

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ llvm::SmallString<128> getAbsolutePath(const tooling::CompileCommand &Cmd) {`
`121`	`121`	`} else {`
`122`	`122`	`AbsolutePath = Cmd.Directory;`
`123`	`123`	`llvm::sys::path::append(AbsolutePath, Cmd.Filename);`
	`124`	`+ llvm::sys::path::remove_dots(AbsolutePath, true);`
`124`	`125`	`}`
`125`	`126`	`return AbsolutePath;`
`126`	`127`	`}`