[clangd] Get rid of getTokenRange helper
Summary:
Reviewers: sammccall
Subscribers: mgorny, ilya-biryukov, MaskRay, jkorous, arphaman, usaxena95, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D75474
diff --git a/clang-tools-extra/clangd/CollectMacros.h b/clang-tools-extra/clangd/CollectMacros.h
index 5c3fca1..eecea04 100644
--- a/clang-tools-extra/clangd/CollectMacros.h
+++ b/clang-tools-extra/clangd/CollectMacros.h
@@ -40,10 +40,8 @@
/// - collect macros after the preamble of the main file (in ParsedAST.cpp)
class CollectMainFileMacros : public PPCallbacks {
public:
- explicit CollectMainFileMacros(const SourceManager &SM,
- const LangOptions &LangOpts,
- MainFileMacros &Out)
- : SM(SM), LangOpts(LangOpts), Out(Out) {}
+ explicit CollectMainFileMacros(const SourceManager &SM, MainFileMacros &Out)
+ : SM(SM), Out(Out) {}
void FileChanged(SourceLocation Loc, FileChangeReason,
SrcMgr::CharacteristicKind, FileID) override {
@@ -89,24 +87,8 @@
}
private:
- void add(const Token &MacroNameTok, const MacroInfo *MI) {
- if (!InMainFile)
- return;
- auto Loc = MacroNameTok.getLocation();
- if (Loc.isMacroID())
- return;
-
- if (auto Range = getTokenRange(SM, LangOpts, Loc)) {
- auto Name = MacroNameTok.getIdentifierInfo()->getName();
- Out.Names.insert(Name);
- if (auto SID = getSymbolID(Name, MI, SM))
- Out.MacroRefs[*SID].push_back(*Range);
- else
- Out.UnknownMacros.push_back(*Range);
- }
- }
+ void add(const Token &MacroNameTok, const MacroInfo *MI);
const SourceManager &SM;
- const LangOptions &LangOpts;
bool InMainFile = true;
MainFileMacros &Out;
};