Author: hokein Date: Thu Sep 26 02:56:37 2019 New Revision: 372953 URL: http://llvm.org/viewvc/llvm-project?rev=372953&view=rev Log: [clang-tidy] Make llvm-header-guard work on llvm git monorepo
Reviewers: gribozavr Reviewed By: gribozavr Subscribers: xazax.hun, ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D68026 Modified: clang-tools-extra/trunk/clang-tidy/llvm/HeaderGuardCheck.cpp clang-tools-extra/trunk/unittests/clang-tidy/LLVMModuleTest.cpp Modified: clang-tools-extra/trunk/clang-tidy/llvm/HeaderGuardCheck.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/llvm/HeaderGuardCheck.cpp?rev=372953&r1=372952&r2=372953&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-tidy/llvm/HeaderGuardCheck.cpp (original) +++ clang-tools-extra/trunk/clang-tidy/llvm/HeaderGuardCheck.cpp Thu Sep 26 02:56:37 2019 @@ -33,6 +33,13 @@ std::string LLVMHeaderGuardCheck::getHea if (PosToolsClang != StringRef::npos) Guard = Guard.substr(PosToolsClang + std::strlen("tools/")); + // Unlike LLVM svn, LLVM git monorepo is named llvm-project, so we replace + // "/llvm-project/" with the cannonical "/llvm/". + const static StringRef LLVMProject = "/llvm-project/"; + size_t PosLLVMProject = Guard.rfind(LLVMProject); + if (PosLLVMProject != StringRef::npos) + Guard = Guard.replace(PosLLVMProject, LLVMProject.size(), "/llvm/"); + // The remainder is LLVM_FULL_PATH_TO_HEADER_H size_t PosLLVM = Guard.rfind("llvm/"); if (PosLLVM != StringRef::npos) Modified: clang-tools-extra/trunk/unittests/clang-tidy/LLVMModuleTest.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-tidy/LLVMModuleTest.cpp?rev=372953&r1=372952&r2=372953&view=diff ============================================================================== --- clang-tools-extra/trunk/unittests/clang-tidy/LLVMModuleTest.cpp (original) +++ clang-tools-extra/trunk/unittests/clang-tidy/LLVMModuleTest.cpp Thu Sep 26 02:56:37 2019 @@ -211,6 +211,15 @@ TEST(LLVMHeaderGuardCheckTest, FixHeader "#endif /* LLVM_ADT_FOO_H\\ \n" " FOO */", "include/llvm/ADT/foo.h", None)); + + EXPECT_EQ("#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_FOO_H\n" + "#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_FOO_H\n" + "\n" + "\n" + "#endif\n", + runHeaderGuardCheck( + "", "/llvm-project/clang-tools-extra/clangd/foo.h", + StringRef("header is missing header guard"))); } #endif _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
