From 0d808e50645703a5993e98f2422df28586547827 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Thu, 26 Sep 2019 09:56:37 +0000 Subject: [PATCH] [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 llvm-svn: 372953 --- clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.cpp | 7 +++++++ clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.cpp b/clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.cpp index c098268..8b32d8d 100644 --- a/clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.cpp +++ b/clang-tools-extra/clang-tidy/llvm/HeaderGuardCheck.cpp @@ -33,6 +33,13 @@ std::string LLVMHeaderGuardCheck::getHeaderGuard(StringRef Filename, 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) diff --git a/clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp b/clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp index aed9f6d..b86f8e6 100644 --- a/clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp +++ b/clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp @@ -211,6 +211,15 @@ TEST(LLVMHeaderGuardCheckTest, FixHeaderGuards) { "#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 -- 2.7.4