WIP: Fix build issues

sourcegraph · Jul 2, 2024 · a1622a8 · a1622a8
1 parent f771346
commit a1622a8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/cfg/builder/builder_walk.cc b/cfg/builder/builder_walk.cc
@@ -904,7 +904,7 @@ BasicBlock *CFGBuilder::walk(CFGContext cctx, ast::ExpressionPtr &what, BasicBlo
                         auto zloc = rescueCase->var.loc().copyWithZeroLength();
                         auto unsafe = ast::MK::Unsafe(
                             zloc, ast::make_expression<ast::Local>(zloc, exceptionValue.data(cctx.inWhat)));
-                        ensureBody = walk(cctx.withTarget(localVar), unsafe, ensureBody);
+                        ensureBody = walk(cctx.withTarget(LocalOccurrence{localVar, local->loc}), unsafe, ensureBody);
                         //CHECK:VARUN - ^Need LocalOccurrence above?
                     }
 

diff --git a/rewriter/Command.cc b/rewriter/Command.cc
@@ -95,8 +95,9 @@ void Command::run(core::MutableContext ctx, ast::ClassDef *klass) {
     // method, there are no calls to it, which will frustrate the user.  Erase
     // the location(s) on the non-synthetic method so that LSP only sees the
     // synthetic method.
-    auto hiddenCall = ast::MK::Method(call->loc.copyWithZeroLength(), call->declLoc.copyWithZeroLength(), call->name,
-                                      std::move(call->args), std::move(call->rhs), call->flags);
+    auto hiddenCall = ast::MK::Method(call->loc.copyWithZeroLength(), call->declLoc.copyWithZeroLength(),
+                                      call->nameLoc.copyWithZeroLength(), call->name, std::move(call->args),
+                                      std::move(call->rhs), call->flags);
 
     // We need to make sure we assign into `callptr` prior to inserting into
     // `klass->rhs`, otherwise our pointer might not be live anymore.

diff --git a/scip_indexer/BUILD b/scip_indexer/BUILD
@@ -53,6 +53,7 @@ cc_library(
         "//cfg",
         "//common",
         "//core",
+        "//core/source_generator",
         "//main/lsp",
         "//proto",
         "//sorbet_version",

diff --git a/scip_indexer/SCIPSymbolRef.cc b/scip_indexer/SCIPSymbolRef.cc
@@ -12,6 +12,7 @@
 
 #include "common/FileSystem.h"
 #include "common/sort/sort.h"
+#include "core/source_generator/source_generator.h"
 #include "core/Loc.h"
 #include "main/lsp/LSPLoop.h"
 
@@ -225,9 +226,9 @@ void GenericSymbolRef::saveDocStrings(const core::GlobalState &gs, core::TypePtr
         }
         case Kind::Method: {
             auto ref = this->selfOrOwner.asMethodRef();
-            auto resultType = ref.data(gs)->owner.data(gs)->resultType;
-            checkType(resultType, fmt::format("result type for {}", ref.showFullName(gs)));
-            markdown = realmain::lsp::prettyTypeForMethod(gs, ref, resultType, nullptr, nullptr);
+            auto recvType = ref.data(gs)->owner.data(gs)->resultType;
+            checkType(recvType, fmt::format("receiver type for {}", ref.showFullName(gs)));
+            markdown = core::source_generator::prettyTypeForMethod(gs, ref, recvType, nullptr, nullptr, core::ShowOptions());
             // FIXME(varun): For some reason, it looks like a bunch of public methods
             // get marked as private here. Avoid printing misleading info until we fix that.
             // https://github.com/sourcegraph/scip-ruby/issues/33