8000 RBS: Do not pass the context when it's not needed by Morriar · Pull Request #8811 · sorbet/sorbet · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

RBS: Do not pass the context when it's not needed #8811

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
merged 1 commit into from
May 1, 2025
Merged

RBS: Do not pass the context when it's not needed #8811

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
12 changes: 6 additions & 6 deletions rbs/SigsRewriter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ void insertHelpers(unique_ptr<parser::Node> *body, parser::NodeVec helpers) {

} // namespace

Comments SigsRewriter::commentsForNode(core::MutableContext ctx, parser::Node *node) {
Comments SigsRewriter::commentsForNode(parser::Node *node) {
auto comments = Comments{};
enum class SignatureState { None, Started, Multiline };
auto state = SignatureState::None;
Expand Down Expand Up @@ -283,8 +283,8 @@ Comments SigsRewriter::commentsForNode(core::MutableContext ctx, parser::Node *n
return comments;
}

unique_ptr<parser::NodeVec> SigsRewriter::signaturesForNode(core::MutableContext ctx, parser::Node *node) {
auto comments = commentsForNode(ctx, node);
unique_ptr<parser::NodeVec> SigsRewriter::signaturesForNode(parser::Node *node) {
auto comments = commentsForNode(node);

if (comments.signatures.empty()) {
return nullptr;
Expand Down Expand Up @@ -329,7 +329,7 @@ unique_ptr<parser::Node> SigsRewriter::rewriteBegin(unique_ptr<parser::Node> nod

for (auto &stmt : oldStmts) {
if (auto target = signaturesTarget(stmt.get())) {
if (auto signatures = signaturesForNode(ctx, target)) {
if (auto signatures = signaturesForNode(target)) {
for (auto &declaration : *signatures) {
begin->stmts.emplace_back(move(declaration));
}
Expand All @@ -352,7 +352,7 @@ unique_ptr<parser::Node> SigsRewriter::rewriteBody(unique_ptr<parser::Node> node
}

if (auto target = signaturesTarget(node.get())) {
if (auto signatures = signaturesForNode(ctx, target)) {
if (auto signatures = signaturesForNode(target)) {
auto begin = make_unique<parser::Begin>(node->loc, parser::NodeVec());
for (auto &declaration : *signatures) {
begin->stmts.emplace_back(move(declaration));
Expand All @@ -370,7 +370,7 @@ unique_ptr<parser::Node> SigsRewriter::rewriteClass(unique_ptr<parser::Node> nod
return node;
}

auto comments = commentsForNode(ctx, node.get());
auto comments = commentsForNode(node.get());
if (comments.annotations.empty()) {
return node;
}
Expand Down
4 changes: 2 additions & 2 deletions rbs/SigsRewriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ class SigsRewriter {
std::unique_ptr<parser::Node> rewriteNode(std::unique_ptr<parser::Node> tree);
std::unique_ptr<parser::Node> rewriteClass(std::unique_ptr<parser::Node> tree);
parser::NodeVec rewriteNodes(parser::NodeVec nodes);
std::unique_ptr<parser::NodeVec> signaturesForNode(core::MutableContext ctx, parser::Node *node);
Comments commentsForNode(core::MutableContext ctx, parser::Node *node);
std::unique_ptr<parser::NodeVec> signaturesForNode(parser::Node *node);
Comments commentsForNode(parser::Node *node);
};

} // namespace sorbet::rbs
Expand Down
0