Set correct block location

parser/Builder.cc

@@ -203,6 +203,8 @@ class Builder::Impl {
 
                 auto raw_numparam_stack = driver_->numparam_stack.stackCopy();
 
+                auto opening_token = raw_numparam_stack.back().opening_token;
+
                 // ignore current block scope
                 raw_numparam_stack.pop_back();
 
@@ -226,7 +228,11 @@ class Builder::Impl {
                 }
 
                 driver_->lex.declare(name_str);
-                auto intro = make_unique<LVar>(node->loc, id->name);
+
+                // The LVar's location matches the non-zero length NumParams node. See `numparams()` for details.
+                core::LocOffsets loc = tokLoc(opening_token).copyEndWithZeroLength();
+                auto intro = make_unique<LVar>(loc, id->name);
+
                 auto decls = driver_->alloc.node_list();
                 decls->emplace_back(toForeign(std::move(intro)));
                 driver_->numparam_stack.regis(name_str[1] - '0', std::move(decls));
@@ -1348,7 +1354,7 @@ class Builder::Impl {
     // `tok` is the opening token:
     //     - for blocks, it's opening `do` or `{`
     //     - for lambdas, it's the `->`
-    // We use it to set the location of the numparams to a zero-length loc just after, as if you had written:
+    // We use it to set the location of the NumParams to a zero-length loc just after, as if you had written:
     //     - `do|_1, _2| ... end`
     //     - `{|_1, _2| ... }`
     //     - `->(_1, _2) { ... }`

parser/parser/cc/grammars/typedruby.ypp

@@ -2155,27 +2155,29 @@ array_premature_end: eof
                       DIAGCHECK();
                     }
                 | lambda
-                | kIF expr_value then compstmt if_tail kend_or_eof
+                | kIF expr_value then compstmt if_tail
                     {
                       auto &else_ = $5;
+                      auto end_t = else_ ? else_->tok : nullptr;
                       $$ = driver.build.condition(self, $1, $2, $3, $4->body,
-                        else_ ? else_->tok : nullptr,
-                        else_ ? else_->nod : nullptr, $6);
-                      driver.rewind_if_dedented($1, $6);
+                        nullptr,
+                        else_ ? else_->nod : nullptr, end_t);
+                      driver.rewind_if_dedented($1, end_t);
                     }
                 | kIF error
                     {
                       auto err = driver.build.error_node(self, @1.endPos(), @2.beginPos());
                       $$ = driver.build.condition(self, $1, err, nullptr, nullptr, nullptr, nullptr, nullptr);
                       driver.replace_last_diagnostic(dlevel::ERROR, dclass::UnexpectedToken, $1, driver.token_name($1->type()));
                     }
-                | kIF strings kDO compstmt if_tail kEND
+                | kIF strings kDO compstmt if_tail
                     {
                       driver.diagnostics.emplace_back(dlevel::ERROR, dclass::IfInsteadOfItForTest, diagnostic::range(@1.beginPos(), @1.endPos()));
                       auto &else_ = $5;
+                      auto end_t = else_ ? else_->tok : nullptr;
                       $$ = driver.build.condition(self, $1, $2, $3, $4->body,
-                        else_ ? else_->tok : nullptr,
-                        else_ ? else_->nod : nullptr, $6);
+                        nullptr,
+                        else_ ? else_->nod : nullptr, end_t);
                     }
                 | kUNLESS expr_value then compstmt opt_else kend_or_eof
                     {
@@ -2461,16 +2463,20 @@ array_premature_end: eof
               do: term
                 | kDO_COND
 
-         if_tail: opt_else
+         if_tail: opt_else kend_or_eof
+                    {
+                      $$ = driver.alloc.node_with_token($2, $1 ? $1->nod : nullptr);
+                    }
                 | kELSIF expr_value then compstmt if_tail
                     {
                       auto elsif_t = $1;
                       auto &else_ = $5;
-                      $$ = driver.alloc.node_with_token(elsif_t,
+                      auto end_t = else_ ? else_->tok : nullptr;
+                      $$ = driver.alloc.node_with_token(end_t,
                         driver.build.condition(self,
                           elsif_t, $2, $3, $4->body,
-                          else_ ? else_->tok : nullptr,
-                          else_ ? else_->nod : nullptr, nullptr)
+                          nullptr,
+                          else_ ? else_->nod : nullptr, end_t)
                       );
                     }