[clang-tidy] getPreviousNonCommentToken -> getPreviousToken
llvm-svn: 294192
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp
index 804b2b0..16955f8 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp
@@ -125,12 +125,12 @@
SourceLocation Location;
switch (Placement) {
case InitializerPlacement::New:
- Location = utils::lexer::getPreviousNonCommentToken(
+ Location = utils::lexer::getPreviousToken(
Context, Constructor.getBody()->getLocStart())
.getLocation();
break;
case InitializerPlacement::Before:
- Location = utils::lexer::getPreviousNonCommentToken(
+ Location = utils::lexer::getPreviousToken(
Context, Where->getSourceRange().getBegin())
.getLocation();
break;
diff --git a/clang-tools-extra/clang-tidy/misc/SuspiciousSemicolonCheck.cpp b/clang-tools-extra/clang-tidy/misc/SuspiciousSemicolonCheck.cpp
index 1d26de9e..f8bcd21 100644
--- a/clang-tools-extra/clang-tidy/misc/SuspiciousSemicolonCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/SuspiciousSemicolonCheck.cpp
@@ -40,7 +40,7 @@
return;
ASTContext &Ctxt = *Result.Context;
- auto Token = utils::lexer::getPreviousNonCommentToken(Ctxt, LocStart);
+ auto Token = utils::lexer::getPreviousToken(Ctxt, LocStart);
auto &SM = *Result.SourceManager;
unsigned SemicolonLine = SM.getSpellingLineNumber(LocStart);
diff --git a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp
index d385cef..0627e51 100644
--- a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp
+++ b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp
@@ -18,7 +18,7 @@
FixItHint changeVarDeclToReference(const VarDecl &Var, ASTContext &Context) {
SourceLocation AmpLocation = Var.getLocation();
- auto Token = utils::lexer::getPreviousNonCommentToken(Context, AmpLocation);
+ auto Token = utils::lexer::getPreviousToken(Context, AmpLocation);
if (!Token.is(tok::unknown))
AmpLocation = Lexer::getLocForEndOfToken(Token.getLocation(), 0,
Context.getSourceManager(),
diff --git a/clang-tools-extra/clang-tidy/utils/LexerUtils.cpp b/clang-tools-extra/clang-tidy/utils/LexerUtils.cpp
index f80661d..d027219 100644
--- a/clang-tools-extra/clang-tidy/utils/LexerUtils.cpp
+++ b/clang-tools-extra/clang-tidy/utils/LexerUtils.cpp
@@ -14,8 +14,8 @@
namespace utils {
namespace lexer {
-Token getPreviousNonCommentToken(const ASTContext &Context,
- SourceLocation Location) {
+Token getPreviousToken(const ASTContext &Context, SourceLocation Location,
+ bool SkipComments) {
const auto &SourceManager = Context.getSourceManager();
Token Token;
Token.setKind(tok::unknown);
@@ -27,7 +27,7 @@
Context.getLangOpts());
if (!Lexer::getRawToken(Location, Token, SourceManager,
Context.getLangOpts()) &&
- !Token.is(tok::comment)) {
+ (!SkipComments || !Token.is(tok::comment))) {
break;
}
Location = Location.getLocWithOffset(-1);
diff --git a/clang-tools-extra/clang-tidy/utils/LexerUtils.h b/clang-tools-extra/clang-tidy/utils/LexerUtils.h
index f218592..f7bcd6f 100644
--- a/clang-tools-extra/clang-tidy/utils/LexerUtils.h
+++ b/clang-tools-extra/clang-tidy/utils/LexerUtils.h
@@ -18,10 +18,9 @@
namespace utils {
namespace lexer {
-/// Returns previous non-comment token skipping over any comment text or
-/// ``tok::unknown`` if not found.
-Token getPreviousNonCommentToken(const ASTContext &Context,
- SourceLocation Location);
+/// Returns previous token or ``tok::unknown`` if not found.
+Token getPreviousToken(const ASTContext &Context, SourceLocation Location,
+ bool SkipComments = true);
} // namespace lexer
} // namespace utils