Restructure StepInRequestHandler::Run.

Author: ashgti

lldb/tools/lldb-dap/Handler/StepInRequestHandler.cpp

@@ -31,24 +31,26 @@ namespace lldb_dap {
 // possible targets for a given source line can be retrieved via the
 // `stepInTargets` request.
 Error StepInRequestHandler::Run(const StepInArguments &args) const {
-  std::string step_in_target;
-  auto it = dap.step_in_targets.find(args.targetId.value_or(0));
-  if (it != dap.step_in_targets.end())
-    step_in_target = it->second;
-
-  RunMode run_mode = args.singleThread ? eOnlyThisThread : eOnlyDuringStepping;
   SBThread thread = dap.GetLLDBThread(args.threadId);
   if (!thread.IsValid())
     return make_error<DAPError>("invalid thread");
 
   // Remember the thread ID that caused the resume so we can set the
   // "threadCausedFocus" boolean value in the "stopped" events.
   dap.focus_tid = thread.GetThreadID();
+
   if (args.granularity == eSteppingGranularityInstruction) {
     thread.StepInstruction(/*step_over=*/false);
-  } else {
-    thread.StepInto(step_in_target.c_str(), run_mode);
+    return Error::success();
   }
+
+  std::string step_in_target;
+  auto it = dap.step_in_targets.find(args.targetId.value_or(0));
+  if (it != dap.step_in_targets.end())
+    step_in_target = it->second;
+
+  RunMode run_mode = args.singleThread ? eOnlyThisThread : eOnlyDuringStepping;
+  thread.StepInto(step_in_target.c_str(), run_mode);
   return Error::success();
 }