Skip to content

fix: set name locations for after/before in the minitest rewriter #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emidoots merged 1 commit into from
Sep 3, 2026
Merged

fix: set name locations for after/before in the minitest rewriter #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rewriter/Minitest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,14 @@ ast::ExpressionPtr runUnderEach(core::MutableContext ctx, core::NameRef eachName
((send->fun == core::Names::before() || send->fun == core::Names::after()) && send->numPosArgs() == 0 &&
correctBlockArity)) {
core::NameRef name;
auto arg0Loc = core::LocOffsets::none();
auto nameLoc = send->funLoc;
if (send->fun == core::Names::before()) {
name = core::Names::beforeAngles();
} else if (send->fun == core::Names::after()) {
name = core::Names::afterAngles();
} else {
// we use this for the name of our test
arg0Loc = send->getPosArg(0).loc();
nameLoc = send->getPosArg(0).loc();
auto argString = to_s(ctx, send->getPosArg(0));
name = ctx.state.enterNameUTF8("<it '" + argString + "'>");
}
Expand Down Expand Up @@ -266,7 +266,7 @@ ast::ExpressionPtr runUnderEach(core::MutableContext ctx, core::NameRef eachName
send->loc.copyWithZeroLength(), move(blk));
// put that into a method def named the appropriate thing
auto declLoc = declLocForSendWithBlock(*send);
auto method = addSigVoid(ast::MK::SyntheticMethod0(send->loc, declLoc, arg0Loc, move(name), move(each)));
auto method = addSigVoid(ast::MK::SyntheticMethod0(send->loc, declLoc, nameLoc, move(name), move(each)));
// add back any moved constants
return constantMover.addConstantsToExpression(send->loc, move(method));
} else if (send->fun == core::Names::describe() && send->numPosArgs() == 1 && correctBlockArity) {
Expand Down
4 changes: 4 additions & 0 deletions test/scip/testdata/minitest_3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ def self.describe(name, &blk); end
test_each([[1,2], [3,4]]) do |(a,b)|

describe "d" do
before do
end
after do
end
it "b" do
T.reveal_type(a) # error: Revealed type: `Integer`
end
Expand Down
10 changes: 10 additions & 0 deletions test/scip/testdata/minitest_3.snapshot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ def self.describe(name, &blk); end
# ^ definition local 2$416088458

describe "d" do
# ⌄ enclosing_range_start [..] Test#`<before>`().
before do
# ^^^^^^ definition [..] Test#`<before>`().
end
# ⌃ enclosing_range_end [..] Test#`<before>`().
# ⌄ enclosing_range_start [..] Test#`<after>`().
after do
# ^^^^^ definition [..] Test#`<after>`().
end
# ⌃ enclosing_range_end [..] Test#`<after>`().
# ⌄ enclosing_range_start [..] Test#`<it 'b'>`().
it "b" do
# ^^^ definition [..] Test#`<it 'b'>`().
Expand Down
Loading