Create clang-tidy check to rename all our includes
It is a little bit scuffed, but it seems to produce correct results. We can run it at a later date when we want to explode every in-flight commit in existence and then need to filter-branch them. Fixes: https://git.lix.systems/lix-project/lix/issues/188 Change-Id: Id97e4651f78804a941d941df02c7c1b21ce453b6
This commit is contained in:
parent
194a1b91af
commit
43cf487c25
5 changed files with 118 additions and 5 deletions
4
clang-tidy/.editorconfig
Normal file
4
clang-tidy/.editorconfig
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
# LLVM style code is 2-space indented
|
||||||
|
[*.{cc,hh}]
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
81
clang-tidy/FixIncludes.cc
Normal file
81
clang-tidy/FixIncludes.cc
Normal file
|
@ -0,0 +1,81 @@
|
||||||
|
#include "FixIncludes.hh"
|
||||||
|
#include <clang-tidy/ClangTidyCheck.h>
|
||||||
|
#include <clang/Basic/Diagnostic.h>
|
||||||
|
#include <clang/Basic/SourceManager.h>
|
||||||
|
#include <clang/Lex/PPCallbacks.h>
|
||||||
|
#include <clang/Lex/Preprocessor.h>
|
||||||
|
#include <llvm/ADT/StringRef.h>
|
||||||
|
#include <llvm/Support/Debug.h>
|
||||||
|
#include <memory>
|
||||||
|
#include <set>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace nix::clang_tidy {
|
||||||
|
|
||||||
|
using namespace clang;
|
||||||
|
using namespace clang::tidy;
|
||||||
|
|
||||||
|
class FixIncludesCallbacks : public PPCallbacks {
|
||||||
|
public:
|
||||||
|
ClangTidyCheck &Check;
|
||||||
|
Preprocessor &PP;
|
||||||
|
FixIncludesCallbacks(ClangTidyCheck &Check, Preprocessor &PP)
|
||||||
|
: Check(Check), PP(PP) {}
|
||||||
|
|
||||||
|
private:
|
||||||
|
bool Ignore = false;
|
||||||
|
virtual void LexedFileChanged(FileID FID, LexedFileChangeReason Reason,
|
||||||
|
SrcMgr::CharacteristicKind FileType,
|
||||||
|
FileID PrevFID, SourceLocation Loc) override;
|
||||||
|
|
||||||
|
virtual void InclusionDirective(SourceLocation HashLoc,
|
||||||
|
const Token &IncludeTok, StringRef FileName,
|
||||||
|
bool IsAngled, CharSourceRange FilenameRange,
|
||||||
|
OptionalFileEntryRef File,
|
||||||
|
StringRef SearchPath, StringRef RelativePath,
|
||||||
|
const Module *Imported,
|
||||||
|
SrcMgr::CharacteristicKind FileType) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
void FixIncludesCallbacks::LexedFileChanged(FileID, LexedFileChangeReason,
|
||||||
|
SrcMgr::CharacteristicKind FileType,
|
||||||
|
FileID, SourceLocation) {
|
||||||
|
Ignore = FileType != SrcMgr::C_User;
|
||||||
|
}
|
||||||
|
|
||||||
|
void FixIncludesCallbacks::InclusionDirective(
|
||||||
|
SourceLocation, const Token &, StringRef, bool,
|
||||||
|
CharSourceRange FilenameRange, OptionalFileEntryRef File, StringRef,
|
||||||
|
StringRef, const Module *, SrcMgr::CharacteristicKind) {
|
||||||
|
if (Ignore)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// FIXME: this is kinda evil, but this is a one-time fixup
|
||||||
|
const std::string SourceDir = "src/";
|
||||||
|
|
||||||
|
if (File && File->getNameAsRequested().contains(SourceDir)) {
|
||||||
|
StringRef Name = File->getNameAsRequested();
|
||||||
|
auto Idx = Name.find(SourceDir);
|
||||||
|
assert(Idx != std::string::npos);
|
||||||
|
StringRef Suffix = Name.drop_front(Idx + SourceDir.length());
|
||||||
|
|
||||||
|
if (!Suffix.starts_with("lib")) {
|
||||||
|
llvm::dbgs() << "ignored: " << Suffix << "\n";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto Diag = Check.diag(FilenameRange.getBegin(),
|
||||||
|
"include needs to specify the source subdir");
|
||||||
|
|
||||||
|
Diag << FilenameRange
|
||||||
|
<< FixItHint::CreateReplacement(FilenameRange,
|
||||||
|
("\"" + Suffix + "\"").str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void FixIncludesCheck::registerPPCallbacks(const SourceManager &,
|
||||||
|
Preprocessor *PP, Preprocessor *) {
|
||||||
|
PP->addPPCallbacks(std::make_unique<FixIncludesCallbacks>(*this, *PP));
|
||||||
|
}
|
||||||
|
|
||||||
|
}; // namespace nix::clang_tidy
|
21
clang-tidy/FixIncludes.hh
Normal file
21
clang-tidy/FixIncludes.hh
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
#pragma once
|
||||||
|
///@file
|
||||||
|
|
||||||
|
#include <clang-tidy/ClangTidyCheck.h>
|
||||||
|
#include <clang/ASTMatchers/ASTMatchFinder.h>
|
||||||
|
#include <llvm/ADT/StringRef.h>
|
||||||
|
|
||||||
|
namespace nix::clang_tidy {
|
||||||
|
|
||||||
|
using namespace clang;
|
||||||
|
using namespace clang::tidy;
|
||||||
|
|
||||||
|
class FixIncludesCheck : public ClangTidyCheck {
|
||||||
|
public:
|
||||||
|
FixIncludesCheck(StringRef Name, ClangTidyContext *Context)
|
||||||
|
: ClangTidyCheck(Name, Context) {}
|
||||||
|
|
||||||
|
void registerPPCallbacks(const SourceManager &SM, Preprocessor *PP, Preprocessor *ModuleExpanderPP) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
|
@ -1,5 +1,6 @@
|
||||||
#include <clang-tidy/ClangTidyModule.h>
|
#include <clang-tidy/ClangTidyModule.h>
|
||||||
#include <clang-tidy/ClangTidyModuleRegistry.h>
|
#include <clang-tidy/ClangTidyModuleRegistry.h>
|
||||||
|
#include "FixIncludes.hh"
|
||||||
#include "HasPrefixSuffix.hh"
|
#include "HasPrefixSuffix.hh"
|
||||||
|
|
||||||
namespace nix::clang_tidy {
|
namespace nix::clang_tidy {
|
||||||
|
@ -9,9 +10,10 @@ using namespace clang::tidy;
|
||||||
class NixClangTidyChecks : public ClangTidyModule {
|
class NixClangTidyChecks : public ClangTidyModule {
|
||||||
public:
|
public:
|
||||||
void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
|
void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
|
||||||
CheckFactories.registerCheck<HasPrefixSuffixCheck>("nix-hasprefixsuffix");
|
CheckFactories.registerCheck<HasPrefixSuffixCheck>("lix-hasprefixsuffix");
|
||||||
|
CheckFactories.registerCheck<FixIncludesCheck>("lix-fixincludes");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
static ClangTidyModuleRegistry::Add<NixClangTidyChecks> X("nix-module", "Adds nix specific checks");
|
static ClangTidyModuleRegistry::Add<NixClangTidyChecks> X("lix-module", "Adds lix specific checks");
|
||||||
};
|
};
|
|
@ -1,8 +1,13 @@
|
||||||
project('nix-clang-tidy', ['cpp', 'c'],
|
project('lix-clang-tidy', ['cpp', 'c'],
|
||||||
version : '0.1',
|
version : '0.1',
|
||||||
default_options : ['warning_level=3', 'cpp_std=c++20'])
|
default_options : ['warning_level=3', 'cpp_std=c++20'])
|
||||||
|
|
||||||
llvm = dependency('Clang', version: '>= 14', modules: ['libclang'])
|
llvm = dependency('Clang', version: '>= 14', modules: ['libclang'])
|
||||||
sources = ['HasPrefixSuffix.cc', 'NixClangTidyChecks.cc']
|
sources = files(
|
||||||
shared_module('nix-clang-tidy', sources,
|
'HasPrefixSuffix.cc',
|
||||||
|
'LixClangTidyChecks.cc',
|
||||||
|
'FixIncludes.cc',
|
||||||
|
)
|
||||||
|
|
||||||
|
shared_module('lix-clang-tidy', sources,
|
||||||
dependencies: llvm)
|
dependencies: llvm)
|
||||||
|
|
Loading…
Reference in a new issue