ymandel created this revision.
ymandel added a reviewer: gribozavr2.
Herald added a project: clang.
ymandel added a subscriber: gmatute.
Currently, `maybeExtendRange` takes a `CharSourceRange`, but only works
correctly for the `TokenRange` case. This change adds proper support for the
`CharRange` case.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D82901
Files:
clang/lib/Tooling/Transformer/SourceCode.cpp
clang/unittests/Tooling/SourceCodeTest.cpp
Index: clang/unittests/Tooling/SourceCodeTest.cpp
===================================================================
--- clang/unittests/Tooling/SourceCodeTest.cpp
+++ clang/unittests/Tooling/SourceCodeTest.cpp
@@ -9,6 +9,8 @@
#include "clang/Tooling/Transformer/SourceCode.h"
#include "TestVisitor.h"
#include "clang/Basic/Diagnostic.h"
+#include "clang/Basic/SourceLocation.h"
+#include "clang/Lex/Lexer.h"
#include "llvm/Testing/Support/Annotations.h"
#include "llvm/Testing/Support/Error.h"
#include "llvm/Testing/Support/SupportHelpers.h"
@@ -21,9 +23,11 @@
using llvm::Succeeded;
using llvm::ValueIs;
using tooling::getAssociatedRange;
+using tooling::getExtendedRange;
using tooling::getExtendedText;
using tooling::getRangeForEdit;
using tooling::getText;
+using tooling::maybeExtendRange;
using tooling::validateEditRange;
namespace {
@@ -52,7 +56,7 @@
arg.getBegin() == R.getBegin() && arg.getEnd() == R.getEnd();
}
-MATCHER_P2(EqualsAnnotatedRange, SM, R, "") {
+MATCHER_P2(EqualsAnnotatedRange, Context, R, "") {
if (arg.getBegin().isMacroID()) {
*result_listener << "which starts in a macro";
return false;
@@ -62,15 +66,13 @@
return false;
}
- unsigned Begin = SM->getFileOffset(arg.getBegin());
- unsigned End = SM->getFileOffset(arg.getEnd());
+ CharSourceRange Range = Lexer::getAsCharRange(
+ arg, Context->getSourceManager(), Context->getLangOpts());
+ unsigned Begin = Context->getSourceManager().getFileOffset(Range.getBegin());
+ unsigned End = Context->getSourceManager().getFileOffset(Range.getEnd());
- *result_listener << "which is [" << Begin << ",";
- if (arg.isTokenRange()) {
- *result_listener << End << "]";
- return Begin == R.Begin && End + 1 == R.End;
- }
- *result_listener << End << ")";
+ *result_listener << "which is a " << (arg.isTokenRange() ? "Token" : "Char")
+ << " range [" << Begin << "," << End << ")";
return Begin == R.Begin && End == R.End;
}
@@ -84,11 +86,13 @@
// Base class for visitors that expect a single match corresponding to a
// specific annotated range.
template <typename T> class AnnotatedCodeVisitor : public TestVisitor<T> {
- llvm::Annotations Code;
+protected:
int MatchCount = 0;
+ llvm::Annotations Code;
public:
AnnotatedCodeVisitor() : Code("$r[[]]") {}
+ // Helper for tests of `getAssociatedRange`.
bool VisitDeclHelper(Decl *Decl) {
// Only consider explicit declarations.
if (Decl->isImplicit())
@@ -96,8 +100,7 @@
++MatchCount;
EXPECT_THAT(getAssociatedRange(*Decl, *this->Context),
- EqualsAnnotatedRange(&this->Context->getSourceManager(),
- Code.range("r")))
+ EqualsAnnotatedRange(this->Context, Code.range("r")))
<< Code.code();
return true;
}
@@ -183,6 +186,45 @@
Visitor.runOver("int foo() { return foo() + 3; }");
}
+TEST(SourceCodeTest, maybeExtendRange_TokenRange) {
+ struct ExtendTokenRangeVisitor
+ : AnnotatedCodeVisitor<ExtendTokenRangeVisitor> {
+ bool VisitCallExpr(CallExpr *CE) {
+ ++MatchCount;
+ EXPECT_THAT(getExtendedRange(*CE, tok::TokenKind::semi, *Context),
+ EqualsAnnotatedRange(Context, Code.range("r")));
+ return true;
+ }
+ };
+
+ ExtendTokenRangeVisitor Visitor;
+ // Extends to include semicolon.
+ Visitor.runOverAnnotated("void f(int x, int y) { $r[[f(x, y);]] }");
+ // Does not extend to include semicolon.
+ Visitor.runOverAnnotated(
+ "int f(int x, int y) { if (0) return $r[[f(x, y)]] + 3; }");
+}
+
+TEST(SourceCodeTest, maybeExtendRange_CharRange) {
+ struct ExtendCharRangeVisitor : AnnotatedCodeVisitor<ExtendCharRangeVisitor> {
+ bool VisitCallExpr(CallExpr *CE) {
+ ++MatchCount;
+ CharSourceRange Call = Lexer::getAsCharRange(CE->getSourceRange(),
+ Context->getSourceManager(),
+ Context->getLangOpts());
+ EXPECT_THAT(maybeExtendRange(Call, tok::TokenKind::semi, *Context),
+ EqualsAnnotatedRange(Context, Code.range("r")));
+ return true;
+ }
+ };
+ ExtendCharRangeVisitor Visitor;
+ // Extends to include semicolon.
+ Visitor.runOverAnnotated("void f(int x, int y) { $r[[f(x, y);]] }");
+ // Does not extend to include semicolon.
+ Visitor.runOverAnnotated(
+ "int f(int x, int y) { if (0) return $r[[f(x, y)]] + 3; }");
+}
+
TEST(SourceCodeTest, getAssociatedRange) {
struct VarDeclsVisitor : AnnotatedCodeVisitor<VarDeclsVisitor> {
bool VisitVarDecl(VarDecl *Decl) { return VisitDeclHelper(Decl); }
Index: clang/lib/Tooling/Transformer/SourceCode.cpp
===================================================================
--- clang/lib/Tooling/Transformer/SourceCode.cpp
+++ clang/lib/Tooling/Transformer/SourceCode.cpp
@@ -37,11 +37,17 @@
CharSourceRange clang::tooling::maybeExtendRange(CharSourceRange Range,
tok::TokenKind Next,
ASTContext &Context) {
- Optional<Token> Tok = Lexer::findNextToken(
- Range.getEnd(), Context.getSourceManager(), Context.getLangOpts());
- if (!Tok || !Tok->is(Next))
+ CharSourceRange R = Lexer::getAsCharRange(Range, Context.getSourceManager(),
+ Context.getLangOpts());
+ if (R.isInvalid())
return Range;
- return CharSourceRange::getTokenRange(Range.getBegin(), Tok->getLocation());
+ Token Tok;
+ bool Err =
+ Lexer::getRawToken(R.getEnd(), Tok, Context.getSourceManager(),
+ Context.getLangOpts(), /*IgnoreWhiteSpace=*/true);
+ if (Err || !Tok.is(Next))
+ return Range;
+ return CharSourceRange::getTokenRange(Range.getBegin(), Tok.getLocation());
}
llvm::Error clang::tooling::validateEditRange(const CharSourceRange &Range,
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
